base/base.gypi - Issue 10198027: enable android x86 build

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.gypi

Issue 10198027: enable android x86 build (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: add TODO for adjust chromium/android target_arch naming scheme Created 8 years, 8 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.gypi

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

index 302f62026824cfa7a2e1d33a27bc5e493f04f6e9..b83ca251c788717e4903dc9bfc10a1682a314c14 100644

--- a/base/base.gypi

+++ b/base/base.gypi

@@ -683,6 +683,13 @@

}],

[ 'OS == "android" and _toolset == "target"', {

+ 'conditions': [

+ ['target_arch == "ia32"', {

+ 'sources/': [

+ ['include', '^atomicops_internals_x86_gcc\\.cc$'],

+ ],

+ }],

+ ],

'dependencies': [

'symbolize',

'../third_party/ashmem/ashmem.gyp:ashmem',

« no previous file with comments | « no previous file | build/android/envsetup.sh » ('j') | no next file with comments »