enable android x86 build

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index db5bf662d30735af777d891a9887c975e5aea19a..85b42f915586c0881f7b8f796c9099ea57e0d0e8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -802,14 +802,20 @@
         'variables': {
           'variables': {
             'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
-            'target_arch%': 'arm',  # target_arch in android terms.
+            'conditions': [
+              ['target_arch == "ia32"', {

[Paweł Hajdan Jr., 2012/04/27 06:56:19]

Wait, target_arch is our (Chromium) thing, so it should be possible to adjust it
to the Android naming scheme so that we don't need those confusing conversions.

I don't expect you to do it right now, but please file a bug and put a TODO here
linking to the bug.

It's important!

[Wei James, 2012/04/27 08:59:05]

fixed with target_arch. thanks 

+                'platform_arch%': 'x86',

[Nico, 2012/04/27 05:29:22]

Remove trailing %

[Wei James, 2012/04/27 08:59:05]

changed to target_arch and removed %. thanks 

+              }, {

[Paweł Hajdan Jr., 2012/04/27 06:56:19]

I don't think the assumption that non-ia32 is an arm will always hold. This
seems fragile.

[Wei James, 2012/04/27 08:59:05]

use target_arch and only change "ia32" to "x86" when target_arch == "ia32".
thanks

+                'platform_arch%': 'arm',

[Nico, 2012/04/27 05:29:22]

Remove trailing %

[Wei James, 2012/04/27 08:59:05]

fixed. thanks 

+              }],
+            ],
 
             # 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 +963,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 +2371,17 @@
             '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': [
+                  # Enable identical code folding to reduce size.
+                  '-Wl, --icf=safe', 

[Paweł Hajdan Jr., 2012/04/27 06:56:19]

nit: Are you sure there should be a space between the comma and "--"? Even if
that works, no space seems safer.

[Wei James, 2012/04/27 08:59:05]

fixed. thanks 

+                ],
+              }],
+            ],
             'libraries': [
               '-l<(android_stlport_library)',
               # Manually link the libgcc.a that the cross compiler uses.