chrome/common_constants.gyp - Issue 11418005: Get a minimal unit_tests target building and running for iOS

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: chrome/common_constants.gyp

Issue 11418005: Get a minimal unit_tests target building and running for iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@chrome-gyp-ios-support

Patch Set: Better ifdefing in chrome_paths Created 8 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/common_constants.gyp

diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp

index e5f6d619a413615f1f1e73636568a7781e4a9452..4e3915818ad2afcd834e1cc9d5e188c70374a0d9 100644

--- a/chrome/common_constants.gyp

+++ b/chrome/common_constants.gyp

@@ -65,6 +65,15 @@

'../base/base.gyp:base',

'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

+ 'target_conditions': [

+ ['OS=="ios"', {

+ # iOS needs chrome_paths_mac, which is excluded by filename rules;

+ # re-add it in target_conditionals so it's after that exclusion.

+ 'sources/': [

+ ['include', '^common/chrome_paths_mac\\.mm$'],

+ ],

+ }],

+ ],

'conditions': [

['toolkit_uses_gtk == 1', {

'dependencies': ['../build/linux/system.gyp:gtk'],

« no previous file with comments | « chrome/common/chrome_version_info_mac.mm ('k') | chrome/test/base/chrome_test_suite.cc » ('j') | no next file with comments »