summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authoryang.gu@intel.com <yang.gu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-28 15:25:31 +0000
committeryang.gu@intel.com <yang.gu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-28 15:25:31 +0000
commitf690ed9164c29b905495632fa61fe17981fd7f51 (patch)
tree1363e42012b81d67186384d5d5e4e56470e14a12 /base/base.gyp
parent5061538e070eb35b07584043f68220e06b41527a (diff)
downloadchromium_src-f690ed9164c29b905495632fa61fe17981fd7f51.zip
chromium_src-f690ed9164c29b905495632fa61fe17981fd7f51.tar.gz
chromium_src-f690ed9164c29b905495632fa61fe17981fd7f51.tar.bz2
Fix build issues in base/ for Android x64
This CL fixes several issues when building files under base/ for Android x64. BUG=346626 Review URL: https://codereview.chromium.org/179373003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 9198342..a01df7a 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -128,7 +128,7 @@
}],
['OS == "android" and _toolset == "target"', {
'conditions': [
- ['target_arch == "ia32"', {
+ ['target_arch == "ia32" or target_arch == "x64"', {
'sources/': [
['include', '^atomicops_internals_x86_gcc\\.cc$'],
],