diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 17:46:22 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 17:46:22 +0000 |
| commit | 4b05289f0fc3da4fe895122cb3024659636dc397 (patch) | |
| tree | f8416cd8c2f125b95b91fb125473f60e8b1ea74f /build | |
| parent | a9fdf999f962a80f778f93a9c8f6d848dd1b9beb (diff) | |
| download | chromium_src-4b05289f0fc3da4fe895122cb3024659636dc397.zip chromium_src-4b05289f0fc3da4fe895122cb3024659636dc397.tar.gz chromium_src-4b05289f0fc3da4fe895122cb3024659636dc397.tar.bz2 | |
Android WebView: don't specify cpu-specific cflags.
The WebView build gets its cpu-specific flags from the Android build
system's current target; specifying them in gyp just causes conflicts,
so don't bother.
BUG=
Review URL: https://codereview.chromium.org/12463031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index d851e37..e74d044 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,10 +2763,10 @@ '-fuse-ld=gold', ], 'conditions': [ - ['arm_thumb==1', { + ['arm_thumb==1 and android_webview_build==0', { 'cflags': [ '-mthumb-interwork' ], }], - ['armv7==0', { + ['armv7==0 and android_webview_build==0', { # Flags suitable for Android emulator 'cflags': [ '-march=armv5te', |