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

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 2701 matching lines @@
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags_cc': [
                   # The codesourcery arm-2009q3 toolchain warns at that the ABI
                   # has changed whenever it encounters a varargs function. This
                   # silences those warnings, as they are not helpful and
                   # clutter legitimate warnings.
                   '-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',
                       '-mfloat-abi=<(arm_float_abi)',
                     ],
                     'conditions': [
                       ['arm_neon==1', {
                         'cflags': [ '-mfpu=neon', ],
                       }, {
                         'cflags': [ '-mfpu=<(arm_fpu)', ],
@@ skipping 18 matching lines @@
                     # Android now supports .relro sections properly.
                     # NOTE: While these flags enable the generation of .relro
                     # sections, the generated libraries can still be loaded on
                     # older Android platform versions.
                     'ldflags': [
                         '-Wl,-z,relro',
                         '-Wl,-z,now',
                         '-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',
                           '-mtune=xscale',
                           '-msoft-float',
                         ],
                         'defines': [
                           '__ARM_ARCH_5__',
                           '__ARM_ARCH_5T__',
                           '__ARM_ARCH_5E__',
@@ skipping 1368 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }