Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2729)

Unified Diff: base/base.gyp

Issue 14597007: Support target/host architecture with ninja iOS builds (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/base.gypi » ('j') | breakpad/breakpad.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 667ec00f8bb8d031c0d7dbcfb12d6f7b2a464ee9..f0264a315077fb4e354d3c53050234f88cc573e7 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -188,7 +188,7 @@
],
},
}],
- ['OS == "mac"', {
+ ['OS == "mac" or (OS == "ios" and _toolset == "host")', {
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
@@ -204,7 +204,7 @@
'../third_party/mach_override/mach_override.gyp:mach_override',
],
}],
- ['OS == "ios"', {
+ ['OS == "ios" and _toolset != "host"', {
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
@@ -674,7 +674,7 @@
'debug/stack_trace_unittest.cc',
],
}],
- ['OS == "ios"', {
+ ['OS == "ios" and _toolset != "host"', {
'sources/': [
# Only test the iOS-meaningful portion of process_utils.
['exclude', '^process_util_unittest'],
@@ -788,7 +788,7 @@
}],
], # conditions
'target_conditions': [
- ['OS == "ios"', {
+ ['OS == "ios" and _toolset != "host"', {
'sources/': [
# Pull in specific Mac files for iOS (which have been filtered out
# by file name rules).
« no previous file with comments | « no previous file | base/base.gypi » ('j') | breakpad/breakpad.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698