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

Side by Side Diff: base/base.gyp

Issue 10389196: Adding base_untrusted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 6 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 | Annotate | Revision Log
« 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 17 matching lines...) Expand all
28 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 28 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
29 ], 29 ],
30 # TODO(gregoryd): direct_dependent_settings should be shared with the 30 # TODO(gregoryd): direct_dependent_settings should be shared with the
31 # 64-bit target, but it doesn't work due to a bug in gyp 31 # 64-bit target, but it doesn't work due to a bug in gyp
32 'direct_dependent_settings': { 32 'direct_dependent_settings': {
33 'include_dirs': [ 33 'include_dirs': [
34 '..', 34 '..',
35 ], 35 ],
36 }, 36 },
37 'conditions': [ 37 'conditions': [
38 [ 'use_glib==1', { 38 ['use_glib==1', {
39 'conditions': [ 39 'conditions': [
40 [ 'chromeos==1', { 40 ['chromeos==1', {
41 'sources/': [ ['include', '_chromeos\\.cc$'] ] 41 'sources/': [ ['include', '_chromeos\\.cc$'] ]
42 }, 42 }],
43 ], 43 ['linux_use_tcmalloc==0', {
44 [ 'linux_use_tcmalloc==0', { 44 'defines': [
45 'NO_TCMALLOC',
46 ],
47 'direct_dependent_settings': {
45 'defines': [ 48 'defines': [
46 'NO_TCMALLOC', 49 'NO_TCMALLOC',
47 ], 50 ],
48 'direct_dependent_settings': {
49 'defines': [
50 'NO_TCMALLOC',
51 ],
52 },
53 }, 51 },
54 ], 52 }],
55 [ 'toolkit_uses_gtk==1', { 53 ['toolkit_uses_gtk==1', {
56 'dependencies': [ 54 'dependencies': [
57 '../build/linux/system.gyp:gtk', 55 '../build/linux/system.gyp:gtk',
58 ], 56 ],
59 'export_dependent_settings': [ 57 'export_dependent_settings': [
60 '../build/linux/system.gyp:gtk', 58 '../build/linux/system.gyp:gtk',
61 ], 59 ],
62 }], 60 }],
63 ], 61 ],
64 'dependencies': [ 62 'dependencies': [
65 'symbolize', 63 'symbolize',
(...skipping 10 matching lines...) Expand all
76 'export_dependent_settings': [ 74 'export_dependent_settings': [
77 '../build/linux/system.gyp:glib', 75 '../build/linux/system.gyp:glib',
78 '../build/linux/system.gyp:x11', 76 '../build/linux/system.gyp:x11',
79 ], 77 ],
80 }, { # use_glib!=1 78 }, { # use_glib!=1
81 'sources/': [ 79 'sources/': [
82 ['exclude', '/xdg_user_dirs/'], 80 ['exclude', '/xdg_user_dirs/'],
83 ['exclude', '_nss\.cc$'], 81 ['exclude', '_nss\.cc$'],
84 ], 82 ],
85 }], 83 }],
86 [ 'OS == "android" and _toolset == "host"', { 84 ['OS == "android" and _toolset == "host"', {
87 # Base for host support is the minimum required to run the 85 # Base for host support is the minimum required to run the
88 # ssl false start blacklist tool. It requires further changes 86 # ssl false start blacklist tool. It requires further changes
89 # to generically support host builds (and tests). 87 # to generically support host builds (and tests).
90 # Note: when building for host, gyp has OS == "android", 88 # Note: when building for host, gyp has OS == "android",
91 # hence the *_android.cc files are included but the actual code 89 # hence the *_android.cc files are included but the actual code
92 # doesn't have OS_ANDROID / ANDROID defined. 90 # doesn't have OS_ANDROID / ANDROID defined.
93 'conditions': [ 91 'conditions': [
94 # Host build on linux depends on system.gyp::gtk as 92 # Host build on linux depends on system.gyp::gtk as
95 # default linux build has TOOLKIT_GTK defined. 93 # default linux build has TOOLKIT_GTK defined.
96 ['host_os == "linux"', { 94 ['host_os == "linux"', {
(...skipping 11 matching lines...) Expand all
108 'sources/': [ 106 'sources/': [
109 ['exclude', '^native_library_linux\\.cc$'], 107 ['exclude', '^native_library_linux\\.cc$'],
110 ['exclude', '^process_util_linux\\.cc$'], 108 ['exclude', '^process_util_linux\\.cc$'],
111 ['exclude', '^sys_info_linux\\.cc$'], 109 ['exclude', '^sys_info_linux\\.cc$'],
112 ['exclude', '^sys_string_conversions_linux\\.cc$'], 110 ['exclude', '^sys_string_conversions_linux\\.cc$'],
113 ['exclude', '^worker_pool_linux\\.cc$'], 111 ['exclude', '^worker_pool_linux\\.cc$'],
114 ], 112 ],
115 }], 113 }],
116 ], 114 ],
117 }], 115 }],
118 [ 'OS == "android" and _toolset == "target"', { 116 ['OS == "android" and _toolset == "target"', {
119 'conditions': [ 117 'conditions': [
120 ['target_arch == "ia32"', { 118 ['target_arch == "ia32"', {
121 'sources/': [ 119 'sources/': [
122 ['include', '^atomicops_internals_x86_gcc\\.cc$'], 120 ['include', '^atomicops_internals_x86_gcc\\.cc$'],
123 ], 121 ],
124 }], 122 }],
125 ], 123 ],
126 'dependencies': [ 124 'dependencies': [
127 'symbolize', 125 'symbolize',
128 '../third_party/ashmem/ashmem.gyp:ashmem', 126 '../third_party/ashmem/ashmem.gyp:ashmem',
(...skipping 10 matching lines...) Expand all
139 ], 137 ],
140 }, 138 },
141 'defines': [ 139 'defines': [
142 'USE_SYMBOLIZE', 140 'USE_SYMBOLIZE',
143 ], 141 ],
144 'sources!': [ 142 'sources!': [
145 'debug/stack_trace.cc', 143 'debug/stack_trace.cc',
146 'debug/stack_trace_posix.cc', 144 'debug/stack_trace_posix.cc',
147 ], 145 ],
148 }], 146 }],
149 [ 'os_bsd==1', { 147 ['os_bsd==1', {
150 'include_dirs': [ 148 'include_dirs': [
151 '/usr/local/include', 149 '/usr/local/include',
152 ], 150 ],
153 'link_settings': { 151 'link_settings': {
154 'libraries': [ 152 'libraries': [
155 '-L/usr/local/lib -lexecinfo', 153 '-L/usr/local/lib -lexecinfo',
156 ], 154 ],
157 },
158 }, 155 },
159 ], 156 }],
160 [ 'OS == "linux"', { 157 ['OS == "linux"', {
161 'link_settings': { 158 'link_settings': {
162 'libraries': [ 159 'libraries': [
163 # We need rt for clock_gettime(). 160 # We need rt for clock_gettime().
164 '-lrt', 161 '-lrt',
165 # For 'native_library_linux.cc' 162 # For 'native_library_linux.cc'
166 '-ldl', 163 '-ldl',
167 ], 164 ],
168 }, 165 },
169 }], 166 }],
170 [ 'OS == "mac"', { 167 ['OS == "mac"', {
171 'link_settings': { 168 'link_settings': {
172 'libraries': [ 169 'libraries': [
173 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 170 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
174 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 171 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
175 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 172 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
176 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 173 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
177 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', 174 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
178 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 175 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
179 ], 176 ],
180 }, 177 },
181 'dependencies': [ 178 'dependencies': [
182 '../third_party/mach_override/mach_override.gyp:mach_override', 179 '../third_party/mach_override/mach_override.gyp:mach_override',
183 ], 180 ],
184 }], 181 }],
185 [ 'OS != "win"', { 182 ['OS != "win"', {
186 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'], 183 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
187 },], 184 },],
188 [ 'component=="shared_library"', { 185 ['component=="shared_library"', {
189 'conditions': [ 186 'conditions': [
190 ['OS=="win"', { 187 ['OS=="win"', {
191 'sources!': [ 188 'sources!': [
192 'debug/debug_on_start_win.cc', 189 'debug/debug_on_start_win.cc',
193 ], 190 ],
194 }], 191 }],
195 ], 192 ],
196 }], 193 }],
197 ], 194 ],
198 'sources': [ 195 'sources': [
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 # base/test/perf_test_suite.h 751 # base/test/perf_test_suite.h
755 # base/test/test_suite.h 752 # base/test/test_suite.h
756 # gtk/gtk.h 753 # gtk/gtk.h
757 '../build/linux/system.gyp:gtk', 754 '../build/linux/system.gyp:gtk',
758 ], 755 ],
759 }], 756 }],
760 ], 757 ],
761 }, 758 },
762 ], 759 ],
763 'conditions': [ 760 'conditions': [
764 [ 'OS == "win"', { 761 ['OS == "win"', {
765 'targets': [ 762 'targets': [
766 { 763 {
767 'target_name': 'base_nacl_win64', 764 'target_name': 'base_nacl_win64',
768 'type': '<(component)', 765 'type': '<(component)',
769 'variables': { 766 'variables': {
770 'base_target': 1, 767 'base_target': 1,
771 }, 768 },
772 'dependencies': [ 769 'dependencies': [
773 'base_static_win64', 770 'base_static_win64',
774 'allocator/allocator.gyp:allocator_extension_thunks_win64', 771 'allocator/allocator.gyp:allocator_extension_thunks_win64',
775 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations_win64', 772 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations_win64',
776 ], 773 ],
777 # TODO(gregoryd): direct_dependent_settings should be shared with the 774 # TODO(gregoryd): direct_dependent_settings should be shared with the
778 # 32-bit target, but it doesn't work due to a bug in gyp 775 # 32-bit target, but it doesn't work due to a bug in gyp
779 'direct_dependent_settings': { 776 'direct_dependent_settings': {
780 'include_dirs': [ 777 'include_dirs': [
781 '..', 778 '..',
782 ], 779 ],
783 }, 780 },
784 'defines': [ 781 'defines': [
785 '<@(nacl_win64_defines)', 782 '<@(nacl_win64_defines)',
786 ], 783 ],
787 'configurations': { 784 'configurations': {
788 'Common_Base': { 785 'Common_Base': {
789 'msvs_target_platform': 'x64', 786 'msvs_target_platform': 'x64',
790 }, 787 },
791 }, 788 },
792 'conditions': [ 789 'conditions': [
793 [ 'component == "shared_library"', { 790 ['component == "shared_library"', {
794 'sources!': [ 791 'sources!': [
795 'debug/debug_on_start_win.cc', 792 'debug/debug_on_start_win.cc',
796 ], 793 ],
797 }], 794 }],
798 ], 795 ],
799 }, 796 },
800 { 797 {
801 'target_name': 'base_i18n_nacl_win64', 798 'target_name': 'base_i18n_nacl_win64',
802 'type': '<(component)', 799 'type': '<(component)',
803 # TODO(gregoryd): direct_dependent_settings should be shared with the 800 # TODO(gregoryd): direct_dependent_settings should be shared with the
(...skipping 14 matching lines...) Expand all
818 'i18n/icu_util_nacl_win64.cc', 815 'i18n/icu_util_nacl_win64.cc',
819 ], 816 ],
820 'configurations': { 817 'configurations': {
821 'Common_Base': { 818 'Common_Base': {
822 'msvs_target_platform': 'x64', 819 'msvs_target_platform': 'x64',
823 }, 820 },
824 }, 821 },
825 }, 822 },
826 ], 823 ],
827 }], 824 }],
828 [ 'os_posix==1 and OS!="mac"', { 825 ['os_posix==1 and OS!="mac"', {
829 'targets': [ 826 'targets': [
830 { 827 {
831 'target_name': 'symbolize', 828 'target_name': 'symbolize',
832 'type': 'static_library', 829 'type': 'static_library',
833 'toolsets': ['host', 'target'], 830 'toolsets': ['host', 'target'],
834 'variables': { 831 'variables': {
835 'chromium_code': 0, 832 'chromium_code': 0,
836 }, 833 },
837 'conditions': [ 834 'conditions': [
838 [ 'OS == "solaris"', { 835 ['OS == "solaris"', {
839 'include_dirs': [ 836 'include_dirs': [
840 '/usr/gnu/include', 837 '/usr/gnu/include',
841 '/usr/gnu/include/libelf', 838 '/usr/gnu/include/libelf',
842 ], 839 ],
843 },], 840 },],
844 ], 841 ],
845 'cflags': [ 842 'cflags': [
846 '-Wno-sign-compare', 843 '-Wno-sign-compare',
847 ], 844 ],
848 'cflags!': [ 845 'cflags!': [
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 ], 932 ],
936 'msvs_settings': { 933 'msvs_settings': {
937 'VCLinkerTool': { 934 'VCLinkerTool': {
938 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 935 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
939 }, 936 },
940 }, 937 },
941 }, 938 },
942 ], 939 ],
943 }], 940 }],
944 ['OS=="mac"', { 941 ['OS=="mac"', {
945 'targets': [ 942 'targets': [
946 { 943 {
947 'target_name': 'closure_blocks_leopard_compat', 944 'target_name': 'closure_blocks_leopard_compat',
948 'sources': [ 945 'sources': [
949 'mac/closure_blocks_leopard_compat.h', 946 'mac/closure_blocks_leopard_compat.h',
950 ], 947 ],
951 'conditions': [ 948 'conditions': [
952 ['mac_sdk == "10.5"', { 949 ['mac_sdk == "10.5"', {
953 'type': 'shared_library', 950 'type': 'shared_library',
954 'product_name': 'closure_blocks_leopard_compat_stub', 951 'product_name': 'closure_blocks_leopard_compat_stub',
955 'variables': { 952 'variables': {
956 # This target controls stripping directly. See below. 953 # This target controls stripping directly. See below.
957 'mac_strip': 0, 954 'mac_strip': 0,
958 }, 955 },
959 'sources': [ 956 'sources': [
960 'mac/closure_blocks_leopard_compat.S', 957 'mac/closure_blocks_leopard_compat.S',
961 ], 958 ],
962 'xcode_settings': { 959 'xcode_settings': {
963 # These values are taken from libSystem.dylib in the 10.5 960 # These values are taken from libSystem.dylib in the 10.5
964 # SDK. Setting LD_DYLIB_INSTALL_NAME causes anything linked 961 # SDK. Setting LD_DYLIB_INSTALL_NAME causes anything linked
965 # against this stub library to look for the symbols it 962 # against this stub library to look for the symbols it
966 # provides in the real libSystem at runtime. When using ld 963 # provides in the real libSystem at runtime. When using ld
967 # from Xcode 4 or later (ld64-123.2 and up), giving two 964 # from Xcode 4 or later (ld64-123.2 and up), giving two
968 # libraries with the same "install name" to the linker will 965 # libraries with the same "install name" to the linker will
969 # cause it to print "ld: warning: dylibs with same install 966 # cause it to print "ld: warning: dylibs with same install
970 # name". This is harmless, and ld will behave as intended 967 # name". This is harmless, and ld will behave as intended
971 # here. 968 # here.
972 # 969 #
973 # The real library's compatibility version is used, and the 970 # The real library's compatibility version is used, and the
974 # value of the current version from the SDK is used to make 971 # value of the current version from the SDK is used to make
975 # it appear as though anything linked against this stub was 972 # it appear as though anything linked against this stub was
976 # linked against the real thing. 973 # linked against the real thing.
977 'LD_DYLIB_INSTALL_NAME': '/usr/lib/libSystem.B.dylib', 974 'LD_DYLIB_INSTALL_NAME': '/usr/lib/libSystem.B.dylib',
978 'DYLIB_COMPATIBILITY_VERSION': '1.0.0', 975 'DYLIB_COMPATIBILITY_VERSION': '1.0.0',
979 'DYLIB_CURRENT_VERSION': '111.1.4', 976 'DYLIB_CURRENT_VERSION': '111.1.4',
980 977
981 # Turn on stripping (yes, even in debug mode), and add the -c 978 # Turn on stripping (yes, even in debug mode), and add the -c
982 # flag. This is what produces a stub library (MH_DYLIB_STUB) 979 # flag. This is what produces a stub library (MH_DYLIB_STUB)
983 # as opposed to a dylib (MH_DYLIB). MH_DYLIB_STUB files 980 # as opposed to a dylib (MH_DYLIB). MH_DYLIB_STUB files
984 # contain symbol tables and everything else needed for 981 # contain symbol tables and everything else needed for
985 # linking, but are stripped of section contents. This is the 982 # linking, but are stripped of section contents. This is the
986 # same way that the stub libraries in Mac OS X SDKs are 983 # same way that the stub libraries in Mac OS X SDKs are
987 # created. dyld will refuse to load a stub library, so this 984 # created. dyld will refuse to load a stub library, so this
988 # provides some insurance in case anyone tries to load the 985 # provides some insurance in case anyone tries to load the
989 # stub at runtime. 986 # stub at runtime.
(...skipping 28 matching lines...) Expand all
1018 'dependencies': [ 1015 'dependencies': [
1019 'base_java', 1016 'base_java',
1020 'base_unittests', 1017 'base_unittests',
1021 ], 1018 ],
1022 'variables': { 1019 'variables': {
1023 'test_suite_name': 'base_unittests', 1020 'test_suite_name': 'base_unittests',
1024 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unit tests<(SHARED_LIB_SUFFIX)', 1021 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unit tests<(SHARED_LIB_SUFFIX)',
1025 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',], 1022 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],
1026 }, 1023 },
1027 'includes': [ '../build/apk_test.gypi' ], 1024 'includes': [ '../build/apk_test.gypi' ],
1028 }], 1025 },
1026 ],
1029 }], 1027 }],
1030 ], 1028 ],
1031 } 1029 }
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