summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-21 17:20:15 +0000
committershashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-21 17:20:15 +0000
commit791262fe2aecfd52409bad3a42986dbd81d0d48d (patch)
tree956b040e3591512de70903d4bffc080b7471ec20
parent8997afddabf0efa3e867d50aaefa2b5f87eed08b (diff)
downloadchromium_src-791262fe2aecfd52409bad3a42986dbd81d0d48d.zip
chromium_src-791262fe2aecfd52409bad3a42986dbd81d0d48d.tar.gz
chromium_src-791262fe2aecfd52409bad3a42986dbd81d0d48d.tar.bz2
Fix Android x86 release official build.
Android toolchain linker does not support --no-keep-files-mapped flag. Add a gyp condition to disable this flag for Android. BUG=177400 Review URL: https://chromiumcodereview.appspot.com/12317040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183828 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 12e9e64..49c28b9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2894,7 +2894,7 @@
['linux_dump_symbols==1', {
'cflags': [ '-g' ],
'conditions': [
- ['target_arch=="ia32"', {
+ ['target_arch=="ia32" and OS!="android"', {
'target_conditions': [
['_toolset=="target"', {
'ldflags': [