Android WebView: don't specify cpu-specific cflags.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 6050224a1ea38fe3be7d27f4be664ee7e9f1f0b5..e21e63272df86ccd1ca5586518230fb60ccc185a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2719,12 +2719,12 @@
                   '-Wno-abi',
                 ],
                 'conditions': [
-                  ['arm_thumb==1', {
+                  ['arm_thumb==1 and android_webview_build==0', {
                     'cflags': [
                     '-mthumb',
                     ]
                   }],
-                  ['armv7==1', {
+                  ['armv7==1 and android_webview_build==0', {
                     'cflags': [
                       '-march=armv7-a',
                       '-mtune=cortex-a8',
@@ -2763,12 +2763,12 @@
                         '-fuse-ld=gold',
                     ],
                     'conditions': [
-                      ['arm_thumb==1', {
+                      ['arm_thumb==1 and android_webview_build==0', {
                         # Android toolchain doesn't support -mimplicit-it=thumb
                         'cflags!': [ '-Wa,-mimplicit-it=thumb' ],

[benm (inactive), 2013/03/14 11:19:24]

do we also want to turn this off for the webview build?

[Torne, 2013/03/14 11:35:15]

Hm, not sure. It looks like the only place this gets turned on is in skia.gyp
which i hadn't looked in. I'm going to have to look at the gyp files more. well
spotted.

                         'cflags': [ '-mthumb-interwork' ],
                       }],
-                      ['armv7==0', {
+                      ['armv7==0 and android_webview_build==0', {
                         # Flags suitable for Android emulator
                         'cflags': [
                           '-march=armv5te',