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

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: 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 unified diff | Download patch
« no previous file with comments | « no previous file | base/base.gypi » ('j') | breakpad/breakpad.gyp » ('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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 'dependencies': [ 667 'dependencies': [
668 '../testing/android/native_test.gyp:native_test_native_code', 668 '../testing/android/native_test.gyp:native_test_native_code',
669 ], 669 ],
670 }], 670 }],
671 ], 671 ],
672 'sources!': [ 672 'sources!': [
673 # Broken on Android, and already disabled there. 673 # Broken on Android, and already disabled there.
674 'debug/stack_trace_unittest.cc', 674 'debug/stack_trace_unittest.cc',
675 ], 675 ],
676 }], 676 }],
677 ['OS == "ios"', { 677 ['OS == "ios" and _toolset != "host"', {
678 'sources/': [ 678 'sources/': [
679 # Only test the iOS-meaningful portion of process_utils. 679 # Only test the iOS-meaningful portion of process_utils.
680 ['exclude', '^process_util_unittest'], 680 ['exclude', '^process_util_unittest'],
681 ['include', '^process_util_unittest_ios\\.cc$'], 681 ['include', '^process_util_unittest_ios\\.cc$'],
682 # Requires spawning processes. 682 # Requires spawning processes.
683 ['exclude', '^metrics/stats_table_unittest\\.cc$'], 683 ['exclude', '^metrics/stats_table_unittest\\.cc$'],
684 # iOS does not use message_pump_libevent. 684 # iOS does not use message_pump_libevent.
685 ['exclude', '^message_pump_libevent_unittest\\.cc$'], 685 ['exclude', '^message_pump_libevent_unittest\\.cc$'],
686 ], 686 ],
687 'conditions': [ 687 'conditions': [
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 'win/win_util_unittest.cc', 781 'win/win_util_unittest.cc',
782 ], 782 ],
783 }], 783 }],
784 ['use_system_nspr==1', { 784 ['use_system_nspr==1', {
785 'dependencies': [ 785 'dependencies': [
786 'third_party/nspr/nspr.gyp:nspr', 786 'third_party/nspr/nspr.gyp:nspr',
787 ], 787 ],
788 }], 788 }],
789 ], # conditions 789 ], # conditions
790 'target_conditions': [ 790 'target_conditions': [
791 ['OS == "ios"', { 791 ['OS == "ios" and _toolset != "host"', {
792 'sources/': [ 792 'sources/': [
793 # Pull in specific Mac files for iOS (which have been filtered out 793 # Pull in specific Mac files for iOS (which have been filtered out
794 # by file name rules). 794 # by file name rules).
795 ['include', '^mac/objc_property_releaser_unittest\\.mm$'], 795 ['include', '^mac/objc_property_releaser_unittest\\.mm$'],
796 ['include', '^mac/bind_objc_block_unittest\\.mm$'], 796 ['include', '^mac/bind_objc_block_unittest\\.mm$'],
797 ['include', '^sys_string_conversions_mac_unittest\\.mm$'], 797 ['include', '^sys_string_conversions_mac_unittest\\.mm$'],
798 ], 798 ],
799 }], 799 }],
800 ], # target_conditions 800 ], # target_conditions
801 }, 801 },
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
1259 'base_unittests.isolate', 1259 'base_unittests.isolate',
1260 ], 1260 ],
1261 'sources': [ 1261 'sources': [
1262 'base_unittests.isolate', 1262 'base_unittests.isolate',
1263 ], 1263 ],
1264 }, 1264 },
1265 ], 1265 ],
1266 }], 1266 }],
1267 ], 1267 ],
1268 } 1268 }
OLDNEW
« 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