base/base.gyp - Issue 179373003: Fix build issues in base/ for Android x64

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/base.gyp

Issue 179373003: Fix build issues in base/ for Android x64 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/base.gyp

diff --git a/base/base.gyp b/base/base.gyp

index dc29040235710b8d0d400e75e2d290dced866f52..d4b40f5639f3fd6642bcc3e3a7b1dd907dac3721 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$'],