commit b78c8be66904318d00edbb7a0a41400a2404e682
author Torne (Richard Coles) <torne@google.com> Fri Jun 20 14:53:35 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Fri Jun 20 14:53:35 2014 +0100
tree ae4e8fc048f9616c3025d1cb4a5c01e30dc1305a
parent 5b034895d9a5f86254b03dea6a1e2ca12b7612dc
parent 22b7bb86b08d266e81f1224d12344c6fe4ab66d5

Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: Ibe384572b8b1becf9f9d9257118e91880a12cc58

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',