build/common.gypi - Issue 58373003: Fix iOS device builds broken by commit d645540

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: build/common.gypi

Issue 58373003: Fix iOS device builds broken by commit d645540 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: sync Created 7 years, 1 month 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: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 06306c8934aeac77a07635c8091b39a1f54a768c..10d2e1c100bd0475e2a308b262a363eec8ade810 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -4664,16 +4664,19 @@

# Target both iPhone and iPad.

'TARGETED_DEVICE_FAMILY': '1,2',

'VALID_ARCHS': 'armv7 i386',

- }],

- ['target_arch=="x64"', {

- 'ARCHS': [

- 'x86_64'

- ],

- }],

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

- 'ARCHS': [

- 'i386'

- ],

+ }, { # OS!="ios"

+ 'conditions': [

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

+ 'ARCHS': [

+ 'x86_64'

+ ],

Mark Mentovai 2013/11/05 13:48:44 Check the indentation. There’s one space to many o

kiyun 2013/11/05 13:56:24 Done.

+ }],

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

+ 'ARCHS': [

+ 'i386'

+ ],

Mark Mentovai 2013/11/05 13:48:44 This one too.

kiyun 2013/11/05 13:56:24 Done.

+ }],

+ ],

}],

« no previous file with comments | « base/memory/discardable_memory_provider_unittest.cc ('k') | no next file » | no next file with comments »