Fix the incorrect include headers in 64-bit arch host for android x86 build
This patch disable '/usr/include32' as the include dir for android x86 build in 64-bit host, otherwise, this include entry causes headers conflict with android NDK headers.
BUG=126611
TEST=
Review URL: https://chromiumcodereview.appspot.com/10375049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136238 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index b79ae1b1..8e18331c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2027,7 +2027,8 @@
# versions, so we have to shadow those differences off
# and make sure a 32-bit-on-64-bit build picks up the
# right files.
- ['host_arch!="ia32"', {
+ # For android build, use NDK headers instead of host headers
+ ['host_arch!="ia32" and OS!="android"', {
'include_dirs+': [
'/usr/include32',
],
