commit b1e05afbf9d31ac43e23478ba5709fd9165cb845
author Torne (Richard Coles) <torne@google.com> Tue Aug 12 13:48:45 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Aug 12 13:48:45 2014 +0100
tree 51f0264163b56a64fea9a5c36d806b1591ddfcfb
parent 9c42a79388ce87185ad04cb02047c1e56ac5e066
parent 184447a86e6c01ecb2a0b9bed8d08290d252c989

Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I579101318ff77c5e0666a08e4acd86ffb7277d4c

pylib/gyp/generator/android.py

diff --git a/pylib/gyp/generator/android.py b/pylib/gyp/generator/android.py
index d7aa902..e6bdfbb 100644
--- a/pylib/gyp/generator/android.py
+++ b/pylib/gyp/generator/android.py
@@ -85,8 +85,8 @@
     'bionic/libc/arch-arm/include',
     'bionic/libc/include',
     'bionic/libstdc++/include',
-    'bionic/libc/kernel/common',
-    'bionic/libc/kernel/arch-arm',
+    'bionic/libc/kernel/uapi',
+    'bionic/libc/kernel/uapi/asm-arm',
     'bionic/libm/include',
     'bionic/libm/include/arm',
     'bionic/libthread_db/include',