diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 12:58:34 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 12:58:34 +0000 |
| commit | 3a626e0894c50650e50c04dbc1426eafb220a7cf (patch) | |
| tree | 2c30bbdc13d9126a36429c502bf146d2daeb5bfb /build | |
| parent | 21b06f5082d5cf95c7e5857ab85e6c8b731c1104 (diff) | |
| download | chromium_src-3a626e0894c50650e50c04dbc1426eafb220a7cf.zip chromium_src-3a626e0894c50650e50c04dbc1426eafb220a7cf.tar.gz chromium_src-3a626e0894c50650e50c04dbc1426eafb220a7cf.tar.bz2 | |
Don't set MIPS specific target arch CFLAGS for android WebView
These flags are set by the android build system in the case of
an android webview build, so don't attempt to reset them.
BUG=
Review URL: https://chromiumcodereview.appspot.com/17956002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 3fd1c77..f812eba 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3043,9 +3043,10 @@ 'target_conditions': [ ['_toolset=="target"', { 'conditions': [ - ['mips_arch_variant=="mips32r2"', { + ['android_webview_build==0 and mips_arch_variant=="mips32r2"', { 'cflags': ['-mips32r2', '-Wa,-mips32r2'], - }, { + }], + ['android_webview_build==0 and mips_arch_variant!="mips32r2"', { 'cflags': ['-mips32', '-Wa,-mips32'], }], ], |