commit 8cc05154025dd32495439bed52e3b6ebb4562841
author Torne (Richard Coles) <torne@google.com> Wed May 14 12:13:19 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 14 12:13:19 2014 +0100
tree 185beeb74cbef0cce3051bff52a44957f98ec360
parent 2137c6fcd4e31c5c0f2c17a94f9ff959be87d995
parent c1ba9691e8bb4e17f5945868049dcbb1983a7c63

Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I0b484281e860eba67fd4bbc3e77546c129375469

pylib/gyp/generator/android.py

diff --git a/pylib/gyp/generator/android.py b/pylib/gyp/generator/android.py
index 3988474..ebc8990 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',