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

Side by Side 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: 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 unified diff | Download patch
« no previous file with comments | « no previous file | base/base.gypi » ('j') | base/base.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 ['OS == "linux"', { 181 ['OS == "linux"', {
182 'link_settings': { 182 'link_settings': {
183 'libraries': [ 183 'libraries': [
184 # We need rt for clock_gettime(). 184 # We need rt for clock_gettime().
185 '-lrt', 185 '-lrt',
186 # For 'native_library_linux.cc' 186 # For 'native_library_linux.cc'
187 '-ldl', 187 '-ldl',
188 ], 188 ],
189 }, 189 },
190 }], 190 }],
191 ['OS == "mac"', { 191 ['OS == "mac" or (OS == "ios" and _toolset == "host")', {
192 'link_settings': { 192 'link_settings': {
193 'libraries': [ 193 'libraries': [
194 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 194 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
195 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k', 195 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k',
196 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 196 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
197 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 197 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
198 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 198 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
199 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', 199 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
200 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 200 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
201 ], 201 ],
202 }, 202 },
203 'dependencies': [ 203 'dependencies': [
204 '../third_party/mach_override/mach_override.gyp:mach_override', 204 '../third_party/mach_override/mach_override.gyp:mach_override',
205 ], 205 ],
206 }], 206 }],
207 ['OS == "ios"', { 207 ['OS == "ios" and _toolset != "host"', {
208 'link_settings': { 208 'link_settings': {
209 'libraries': [ 209 'libraries': [
210 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 210 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
211 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', 211 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
212 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', 212 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
213 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 213 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
214 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 214 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
215 ], 215 ],
216 }, 216 },
217 }], 217 }],
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 'dependencies': [ 666 'dependencies': [
667 '../testing/android/native_test.gyp:native_test_native_code', 667 '../testing/android/native_test.gyp:native_test_native_code',
668 ], 668 ],
669 }], 669 }],
670 ], 670 ],
671 'sources!': [ 671 'sources!': [
672 # Broken on Android, and already disabled there. 672 # Broken on Android, and already disabled there.
673 'debug/stack_trace_unittest.cc', 673 'debug/stack_trace_unittest.cc',
674 ], 674 ],
675 }], 675 }],
676 ['OS == "ios"', { 676 ['OS == "ios" and _toolset != "host"', {
677 'sources/': [ 677 'sources/': [
678 # Only test the iOS-meaningful portion of process_utils. 678 # Only test the iOS-meaningful portion of process_utils.
679 ['exclude', '^process_util_unittest'], 679 ['exclude', '^process_util_unittest'],
680 ['include', '^process_util_unittest_ios\\.cc$'], 680 ['include', '^process_util_unittest_ios\\.cc$'],
681 # Requires spawning processes. 681 # Requires spawning processes.
682 ['exclude', '^metrics/stats_table_unittest\\.cc$'], 682 ['exclude', '^metrics/stats_table_unittest\\.cc$'],
683 # iOS does not use message_pump_libevent. 683 # iOS does not use message_pump_libevent.
684 ['exclude', '^message_pump_libevent_unittest\\.cc$'], 684 ['exclude', '^message_pump_libevent_unittest\\.cc$'],
685 ], 685 ],
686 'conditions': [ 686 'conditions': [
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 'win/win_util_unittest.cc', 780 'win/win_util_unittest.cc',
781 ], 781 ],
782 }], 782 }],
783 ['use_system_nspr==1', { 783 ['use_system_nspr==1', {
784 'dependencies': [ 784 'dependencies': [
785 'third_party/nspr/nspr.gyp:nspr', 785 'third_party/nspr/nspr.gyp:nspr',
786 ], 786 ],
787 }], 787 }],
788 ], # conditions 788 ], # conditions
789 'target_conditions': [ 789 'target_conditions': [
790 ['OS == "ios"', { 790 ['OS == "ios" and _toolset != "host"', {
791 'sources/': [ 791 'sources/': [
792 # Pull in specific Mac files for iOS (which have been filtered out 792 # Pull in specific Mac files for iOS (which have been filtered out
793 # by file name rules). 793 # by file name rules).
794 ['include', '^mac/objc_property_releaser_unittest\\.mm$'], 794 ['include', '^mac/objc_property_releaser_unittest\\.mm$'],
795 ['include', '^mac/bind_objc_block_unittest\\.mm$'], 795 ['include', '^mac/bind_objc_block_unittest\\.mm$'],
796 ['include', '^sys_string_conversions_mac_unittest\\.mm$'], 796 ['include', '^sys_string_conversions_mac_unittest\\.mm$'],
797 ], 797 ],
798 }], 798 }],
799 ], # target_conditions 799 ], # target_conditions
800 }, 800 },
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1230 'base_unittests.isolate', 1230 'base_unittests.isolate',
1231 ], 1231 ],
1232 'sources': [ 1232 'sources': [
1233 'base_unittests.isolate', 1233 'base_unittests.isolate',
1234 ], 1234 ],
1235 }, 1235 },
1236 ], 1236 ],
1237 }], 1237 }],
1238 ], 1238 ],
1239 } 1239 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gypi » ('j') | base/base.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698