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

Side by Side Diff: base/base.gyp

Issue 10785047: Remove all the OS X 10.6 SDK forward declarations. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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/mac/closure_blocks_leopard_compat.h » ('j') | no next file with comments »
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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 'i18n/time_formatting_unittest.cc', 408 'i18n/time_formatting_unittest.cc',
409 'json/json_parser_unittest.cc', 409 'json/json_parser_unittest.cc',
410 'json/json_reader_unittest.cc', 410 'json/json_reader_unittest.cc',
411 'json/json_value_converter_unittest.cc', 411 'json/json_value_converter_unittest.cc',
412 'json/json_value_serializer_unittest.cc', 412 'json/json_value_serializer_unittest.cc',
413 'json/json_writer_unittest.cc', 413 'json/json_writer_unittest.cc',
414 'json/string_escape_unittest.cc', 414 'json/string_escape_unittest.cc',
415 'lazy_instance_unittest.cc', 415 'lazy_instance_unittest.cc',
416 'linked_list_unittest.cc', 416 'linked_list_unittest.cc',
417 'logging_unittest.cc', 417 'logging_unittest.cc',
418 'mac/closure_blocks_leopard_compat_unittest.cc',
419 'mac/foundation_util_unittest.mm', 418 'mac/foundation_util_unittest.mm',
420 'mac/mac_util_unittest.mm', 419 'mac/mac_util_unittest.mm',
421 'mac/objc_property_releaser_unittest.mm', 420 'mac/objc_property_releaser_unittest.mm',
422 'mac/scoped_sending_event_unittest.mm', 421 'mac/scoped_sending_event_unittest.mm',
423 'md5_unittest.cc', 422 'md5_unittest.cc',
424 'memory/aligned_memory_unittest.cc', 423 'memory/aligned_memory_unittest.cc',
425 'memory/linked_ptr_unittest.cc', 424 'memory/linked_ptr_unittest.cc',
426 'memory/mru_cache_unittest.cc', 425 'memory/mru_cache_unittest.cc',
427 'memory/ref_counted_memory_unittest.cc', 426 'memory/ref_counted_memory_unittest.cc',
428 'memory/ref_counted_unittest.cc', 427 'memory/ref_counted_unittest.cc',
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 ], 633 ],
635 'sources/': [ 634 'sources/': [
636 ['exclude', '^win/'], 635 ['exclude', '^win/'],
637 ], 636 ],
638 'sources!': [ 637 'sources!': [
639 'debug/trace_event_win_unittest.cc', 638 'debug/trace_event_win_unittest.cc',
640 'time_win_unittest.cc', 639 'time_win_unittest.cc',
641 'win/win_util_unittest.cc', 640 'win/win_util_unittest.cc',
642 ], 641 ],
643 }], 642 }],
644 ['OS=="mac"', {
645 'dependencies': [
646 'closure_blocks_leopard_compat',
647 ],
648 }],
649 ], # conditions 643 ], # conditions
650 'target_conditions': [ 644 'target_conditions': [
651 ['OS == "ios"', { 645 ['OS == "ios"', {
652 'sources/': [ 646 'sources/': [
653 # Pull in specific Mac files for iOS (which have been filtered out 647 # Pull in specific Mac files for iOS (which have been filtered out
654 # by file name rules). 648 # by file name rules).
655 ['include', '^mac/objc_property_releaser_unittest\\.mm$'], 649 ['include', '^mac/objc_property_releaser_unittest\\.mm$'],
656 ['include', '^sys_string_conversions_mac_unittest\\.mm$'], 650 ['include', '^sys_string_conversions_mac_unittest\\.mm$'],
657 ], 651 ],
658 }], 652 }],
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 'debug_message.cc', 980 'debug_message.cc',
987 ], 981 ],
988 'msvs_settings': { 982 'msvs_settings': {
989 'VCLinkerTool': { 983 'VCLinkerTool': {
990 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 984 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
991 }, 985 },
992 }, 986 },
993 }, 987 },
994 ], 988 ],
995 }], 989 }],
996 ['OS=="mac"', {
997 'targets': [
998 {
999 'target_name': 'closure_blocks_leopard_compat',
1000 'sources': [
1001 'mac/closure_blocks_leopard_compat.h',
1002 ],
1003 'conditions': [
1004 ['mac_sdk == "10.5"', {
1005 'type': 'shared_library',
1006 'product_name': 'closure_blocks_leopard_compat_stub',
1007 'variables': {
1008 # This target controls stripping directly. See below.
1009 'mac_strip': 0,
1010 },
1011 'sources': [
1012 'mac/closure_blocks_leopard_compat.S',
1013 ],
1014 'xcode_settings': {
1015 # These values are taken from libSystem.dylib in the 10.5
1016 # SDK. Setting LD_DYLIB_INSTALL_NAME causes anything linked
1017 # against this stub library to look for the symbols it
1018 # provides in the real libSystem at runtime. When using ld
1019 # from Xcode 4 or later (ld64-123.2 and up), giving two
1020 # libraries with the same "install name" to the linker will
1021 # cause it to print "ld: warning: dylibs with same install
1022 # name". This is harmless, and ld will behave as intended
1023 # here.
1024 #
1025 # The real library's compatibility version is used, and the
1026 # value of the current version from the SDK is used to make
1027 # it appear as though anything linked against this stub was
1028 # linked against the real thing.
1029 'LD_DYLIB_INSTALL_NAME': '/usr/lib/libSystem.B.dylib',
1030 'DYLIB_COMPATIBILITY_VERSION': '1.0.0',
1031 'DYLIB_CURRENT_VERSION': '111.1.4',
1032
1033 # Turn on stripping (yes, even in debug mode), and add the -c
1034 # flag. This is what produces a stub library (MH_DYLIB_STUB)
1035 # as opposed to a dylib (MH_DYLIB). MH_DYLIB_STUB files
1036 # contain symbol tables and everything else needed for
1037 # linking, but are stripped of section contents. This is the
1038 # same way that the stub libraries in Mac OS X SDKs are
1039 # created. dyld will refuse to load a stub library, so this
1040 # provides some insurance in case anyone tries to load the
1041 # stub at runtime.
1042 'DEPLOYMENT_POSTPROCESSING': 'YES',
1043 'STRIP_STYLE': 'non-global',
1044 'STRIPFLAGS': '-c',
1045 },
1046 }, { # else: mac_sdk != "10.5"
1047 # When using the 10.6 SDK or newer, the necessary definitions
1048 # are already present in libSystem.dylib. There is no need to
1049 # build a stub dylib to provide these symbols at link time.
1050 # This target is still useful to cause those symbols to be
1051 # treated as weak imports in dependents, who still must
1052 # #include closure_blocks_leopard_compat.h to get weak imports.
1053 'type': 'none',
1054 }],
1055 ],
1056 },
1057 ],
1058 }],
1059 # Special target to wrap a gtest_target_type == shared_library 990 # Special target to wrap a gtest_target_type == shared_library
1060 # base_unittests into an android apk for execution. 991 # base_unittests into an android apk for execution.
1061 # TODO(jrg): lib.target comes from _InstallableTargetInstallPath() 992 # TODO(jrg): lib.target comes from _InstallableTargetInstallPath()
1062 # in the gyp make generator. What is the correct way to extract 993 # in the gyp make generator. What is the correct way to extract
1063 # this path from gyp and into 'raw' for input to antfiles? 994 # this path from gyp and into 'raw' for input to antfiles?
1064 # Hard-coding in the gypfile seems a poor choice. 995 # Hard-coding in the gypfile seems a poor choice.
1065 ['OS == "android" and gtest_target_type == "shared_library"', { 996 ['OS == "android" and gtest_target_type == "shared_library"', {
1066 'targets': [ 997 'targets': [
1067 { 998 {
1068 'target_name': 'base_unittests_apk', 999 'target_name': 'base_unittests_apk',
1069 'type': 'none', 1000 'type': 'none',
1070 'dependencies': [ 1001 'dependencies': [
1071 'base_java', 1002 'base_java',
1072 'base_unittests', 1003 'base_unittests',
1073 ], 1004 ],
1074 'variables': { 1005 'variables': {
1075 'test_suite_name': 'base_unittests', 1006 'test_suite_name': 'base_unittests',
1076 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unit tests<(SHARED_LIB_SUFFIX)', 1007 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unit tests<(SHARED_LIB_SUFFIX)',
1077 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',], 1008 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],
1078 }, 1009 },
1079 'includes': [ '../build/apk_test.gypi' ], 1010 'includes': [ '../build/apk_test.gypi' ],
1080 }, 1011 },
1081 ], 1012 ],
1082 }], 1013 }],
1083 ], 1014 ],
1084 } 1015 }
OLDNEW
« no previous file with comments | « no previous file | base/mac/closure_blocks_leopard_compat.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698