enable android x86 build

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index db5bf662d30735af777d891a9887c975e5aea19a..f7a5070af3c1f67850561e318de6b7fb095ba293 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -802,14 +802,19 @@
         'variables': {
           'variables': {
             'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
-            'target_arch%': 'arm',  # target_arch in android terms.
+            'platform_arch%': 'arm',

[John Grabowski, 2012/04/26 21:53:08]

Might prefer a gyp style if/else (e.g. conditions have an else clause) 

+            'conditions': [
+              ['target_arch == "ia32"', {
+                'platform_arch%': 'x86',
+              }],
+            ],
 
             # Switch between different build types, currently only '0' is
             # supported.
             'android_build_type%': 0,
           },
           'android_ndk_root%': '<(android_ndk_root)',
-          'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<(target_arch)',
+          'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<(platform_arch)',
           'android_build_type%': '<(android_build_type)',
         },
         'android_ndk_root%': '<(android_ndk_root)',
@@ -957,7 +962,7 @@
         ],
       }],
 
-      ['os_posix==1 and chromeos==0 and target_arch!="arm"', {
+      ['os_posix==1 and chromeos==0 and OS!="android"', {
         'use_cups%': 1,
       }, {
         'use_cups%': 0,
@@ -2365,10 +2370,16 @@
             'ldflags': [
               '-nostdlib',
               '-Wl,--no-undefined',
-              '-Wl,--icf=safe',  # Enable identical code folding to reduce size
               # Don't export symbols from statically linked libraries.
               '-Wl,--exclude-libs=ALL',
             ],
+            'conditions': [
+              ['target_arch == "arm"', {
+                'ldflags': [
+                  '-Wl, --icf=safe', # Enable identical code folding to reduce size.
+                ],
+              }],
+            ],
             'libraries': [
               '-l<(android_stlport_library)',
               # Manually link the libgcc.a that the cross compiler uses.