commit ab698fc6eb60fb51ca59b4842c76197e3cf7a671
author Ben Murdoch <benm@google.com> Mon Mar 31 11:52:16 2014 +0100
committer Ben Murdoch <benm@google.com> Mon Mar 31 11:52:16 2014 +0100
tree d1273aef2289a742888cba7e15067f5ac0ae16c5
parent 30066eef55789570ad5281b1986e863dcf8f83b3
parent 13b7b45397e6a2724a2c1e425efec3022f702a8c

Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: Ie0621a691f0c92d8fc898e755fcf23935aef510d

pylib/gyp/generator/android.py

diff --git a/pylib/gyp/generator/android.py b/pylib/gyp/generator/android.py
index 5b7c3ce..131a265 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',