Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 2b1cd407919edeaef71ef33c25abddd7559b6f49..5d5b16a7bd47f4d4aca477cfd8d4748a73d4f2ff 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -808,7 +808,16 @@ |
'variables': { |
'variables': { |
'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', |
- 'target_arch%': 'arm', # target_arch in android terms. |
+ # Android uses x86 instead of ia32 for their target_arch |
+ # designation. |
+ # TODO(wistoch): Adjust the target_arch naming scheme to avoid |
+ # confusion. |
+ # http://crbug.com/125329 |
+ 'conditions': [ |
+ ['target_arch == "ia32"', { |
+ 'target_arch': 'x86', |
+ }], |
+ ], |
# Switch between different build types, currently only '0' is |
# supported. |
@@ -963,7 +972,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, |
@@ -2366,7 +2375,6 @@ |
'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', |
], |
@@ -2385,6 +2393,12 @@ |
'--sysroot=<(android_ndk_sysroot)', |
], |
}], |
+ ['target_arch == "arm"', { |
+ 'ldflags': [ |
+ # Enable identical code folding to reduce size. |
+ '-Wl,--icf=safe', |
+ ], |
+ }], |
# NOTE: The stlport header include paths below are specified in |
# cflags rather than include_dirs because they need to come |
# after include_dirs. Think of them like system headers, but |