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

Side by Side Diff: chrome/chrome.gyp

Issue 8547005: CrOs: Remove 2 static initializers and 2 exit time destructors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month 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 | « chrome/browser/chromeos/status/network_menu_icon.cc ('k') | chrome/chrome_browser.gypi » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 ] 156 ]
157 } 157 }
158 ], 158 ],
159 }], 159 }],
160 ], 160 ],
161 }, 161 },
162 { 162 {
163 # TODO(joi): Move debugger-related build rules to content/ 163 # TODO(joi): Move debugger-related build rules to content/
164 'target_name': 'debugger', 164 'target_name': 'debugger',
165 'type': 'static_library', 165 'type': 'static_library',
166 'variables': { 'enable_wexit_time_destructors': 1, },
166 'dependencies': [ 167 'dependencies': [
167 'chrome_resources.gyp:chrome_extra_resources', 168 'chrome_resources.gyp:chrome_extra_resources',
168 'chrome_resources.gyp:chrome_resources', 169 'chrome_resources.gyp:chrome_resources',
169 'chrome_resources.gyp:chrome_strings', 170 'chrome_resources.gyp:chrome_strings',
170 'chrome_resources.gyp:theme_resources', 171 'chrome_resources.gyp:theme_resources',
171 '../base/base.gyp:base', 172 '../base/base.gyp:base',
172 '../content/content.gyp:content_browser', 173 '../content/content.gyp:content_browser',
173 '../net/net.gyp:http_server', 174 '../net/net.gyp:http_server',
174 '../net/net.gyp:net', 175 '../net/net.gyp:net',
175 '../skia/skia.gyp:skia', 176 '../skia/skia.gyp:skia',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 ['toolkit_uses_gtk == 1', { 211 ['toolkit_uses_gtk == 1', {
211 'dependencies': [ 212 'dependencies': [
212 '../build/linux/system.gyp:gtk', 213 '../build/linux/system.gyp:gtk',
213 ], 214 ],
214 }], 215 }],
215 ], 216 ],
216 }, 217 },
217 { 218 {
218 'target_name': 'plugin', 219 'target_name': 'plugin',
219 'type': 'static_library', 220 'type': 'static_library',
221 'variables': { 'enable_wexit_time_destructors': 1, },
220 'dependencies': [ 222 'dependencies': [
221 'chrome_resources.gyp:chrome_strings', 223 'chrome_resources.gyp:chrome_strings',
222 '../base/base.gyp:base', 224 '../base/base.gyp:base',
223 '../content/content.gyp:content_plugin', 225 '../content/content.gyp:content_plugin',
224 ], 226 ],
225 'sources': [ 227 'sources': [
226 'plugin/chrome_content_plugin_client.cc', 228 'plugin/chrome_content_plugin_client.cc',
227 'plugin/chrome_content_plugin_client.h', 229 'plugin/chrome_content_plugin_client.h',
228 ], 230 ],
229 'include_dirs': [ 231 'include_dirs': [
230 '..', 232 '..',
231 '<(grit_out_dir)', 233 '<(grit_out_dir)',
232 ], 234 ],
233 }, 235 },
234 { 236 {
235 'target_name': 'utility', 237 'target_name': 'utility',
236 'type': 'static_library', 238 'type': 'static_library',
239 'variables': { 'enable_wexit_time_destructors': 1, },
237 'dependencies': [ 240 'dependencies': [
238 '../base/base.gyp:base', 241 '../base/base.gyp:base',
239 '../content/content.gyp:content_utility', 242 '../content/content.gyp:content_utility',
240 '../skia/skia.gyp:skia', 243 '../skia/skia.gyp:skia',
241 ], 244 ],
242 'sources': [ 245 'sources': [
243 'utility/chrome_content_utility_client.cc', 246 'utility/chrome_content_utility_client.cc',
244 'utility/chrome_content_utility_client.h', 247 'utility/chrome_content_utility_client.h',
245 ], 248 ],
246 'include_dirs': [ 249 'include_dirs': [
247 '..', 250 '..',
248 ], 251 ],
249 'conditions': [ 252 'conditions': [
250 ['toolkit_uses_gtk == 1', { 253 ['toolkit_uses_gtk == 1', {
251 'dependencies': [ 254 'dependencies': [
252 '../build/linux/system.gyp:gtk', 255 '../build/linux/system.gyp:gtk',
253 ], 256 ],
254 }], 257 }],
255 ], 258 ],
256 }, 259 },
257 { 260 {
258 # Provides a syncapi dynamic library target from checked-in binaries, 261 # Provides a syncapi dynamic library target from checked-in binaries,
259 # or from compiling a stub implementation. 262 # or from compiling a stub implementation.
260 'target_name': 'syncapi_core', 263 'target_name': 'syncapi_core',
261 'type': 'static_library', 264 'type': 'static_library',
265 'variables': { 'enable_wexit_time_destructors': 1, },
262 'sources': [ 266 'sources': [
263 'browser/sync/engine/syncapi_internal.cc', 267 'browser/sync/engine/syncapi_internal.cc',
264 'browser/sync/engine/syncapi_internal.h', 268 'browser/sync/engine/syncapi_internal.h',
265 'browser/sync/internal_api/base_node.cc', 269 'browser/sync/internal_api/base_node.cc',
266 'browser/sync/internal_api/base_node.h', 270 'browser/sync/internal_api/base_node.h',
267 'browser/sync/internal_api/base_transaction.cc', 271 'browser/sync/internal_api/base_transaction.cc',
268 'browser/sync/internal_api/base_transaction.h', 272 'browser/sync/internal_api/base_transaction.h',
269 'browser/sync/internal_api/change_record.cc', 273 'browser/sync/internal_api/change_record.cc',
270 'browser/sync/internal_api/change_record.h', 274 'browser/sync/internal_api/change_record.h',
271 'browser/sync/internal_api/change_reorder_buffer.cc', 275 'browser/sync/internal_api/change_reorder_buffer.cc',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 'sync', 320 'sync',
317 ], 321 ],
318 # This target exports a hard dependency because syncapi.h includes 322 # This target exports a hard dependency because syncapi.h includes
319 # generated proto header files from sync_proto. 323 # generated proto header files from sync_proto.
320 'hard_dependency': 1, 324 'hard_dependency': 1,
321 }, 325 },
322 { 326 {
323 # Provides the API that Chrome services use to talk to sync. 327 # Provides the API that Chrome services use to talk to sync.
324 'target_name': 'syncapi_service', 328 'target_name': 'syncapi_service',
325 'type': 'static_library', 329 'type': 'static_library',
330 'variables': { 'enable_wexit_time_destructors': 1, },
326 'sources': [ 331 'sources': [
327 'browser/sync/api/syncable_service.cc', 332 'browser/sync/api/syncable_service.cc',
328 'browser/sync/api/syncable_service.h', 333 'browser/sync/api/syncable_service.h',
329 'browser/sync/api/sync_data.h', 334 'browser/sync/api/sync_data.h',
330 'browser/sync/api/sync_data.cc', 335 'browser/sync/api/sync_data.cc',
331 'browser/sync/api/sync_change.h', 336 'browser/sync/api/sync_change.h',
332 'browser/sync/api/sync_change.cc', 337 'browser/sync/api/sync_change.cc',
333 'browser/sync/api/sync_change_processor.h', 338 'browser/sync/api/sync_change_processor.h',
334 'browser/sync/api/sync_change_processor.cc', 339 'browser/sync/api/sync_change_processor.cc',
335 'browser/sync/api/sync_error.h', 340 'browser/sync/api/sync_error.h',
(...skipping 13 matching lines...) Expand all
349 'sync', 354 'sync',
350 ], 355 ],
351 # Even though this target depends on sync_proto, it doesn't 356 # Even though this target depends on sync_proto, it doesn't
352 # need to export a hard dependency since we explicitly avoid 357 # need to export a hard dependency since we explicitly avoid
353 # including the generated proto header files from this target's 358 # including the generated proto header files from this target's
354 # header files. 359 # header files.
355 }, 360 },
356 { 361 {
357 'target_name': 'sync', 362 'target_name': 'sync',
358 'type': 'static_library', 363 'type': 'static_library',
364 'variables': { 'enable_wexit_time_destructors': 1, },
359 'sources': [ 365 'sources': [
360 'browser/sync/engine/all_status.cc', 366 'browser/sync/engine/all_status.cc',
361 'browser/sync/engine/all_status.h', 367 'browser/sync/engine/all_status.h',
362 'browser/sync/engine/apply_updates_command.cc', 368 'browser/sync/engine/apply_updates_command.cc',
363 'browser/sync/engine/apply_updates_command.h', 369 'browser/sync/engine/apply_updates_command.h',
364 'browser/sync/engine/build_and_process_conflict_sets_command.cc', 370 'browser/sync/engine/build_and_process_conflict_sets_command.cc',
365 'browser/sync/engine/build_and_process_conflict_sets_command.h', 371 'browser/sync/engine/build_and_process_conflict_sets_command.h',
366 'browser/sync/engine/build_commit_command.cc', 372 'browser/sync/engine/build_commit_command.cc',
367 'browser/sync/engine/build_commit_command.h', 373 'browser/sync/engine/build_commit_command.h',
368 'browser/sync/engine/cleanup_disabled_types_command.cc', 374 'browser/sync/engine/cleanup_disabled_types_command.cc',
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', 553 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
548 ], 554 ],
549 }, 555 },
550 }], 556 }],
551 ], 557 ],
552 }, 558 },
553 # A library for sending and receiving server-issued notifications. 559 # A library for sending and receiving server-issued notifications.
554 { 560 {
555 'target_name': 'sync_notifier', 561 'target_name': 'sync_notifier',
556 'type': 'static_library', 562 'type': 'static_library',
563 'variables': { 'enable_wexit_time_destructors': 1, },
557 'sources': [ 564 'sources': [
558 'browser/sync/notifier/cache_invalidation_packet_handler.cc', 565 'browser/sync/notifier/cache_invalidation_packet_handler.cc',
559 'browser/sync/notifier/cache_invalidation_packet_handler.h', 566 'browser/sync/notifier/cache_invalidation_packet_handler.h',
560 'browser/sync/notifier/chrome_invalidation_client.cc', 567 'browser/sync/notifier/chrome_invalidation_client.cc',
561 'browser/sync/notifier/chrome_invalidation_client.h', 568 'browser/sync/notifier/chrome_invalidation_client.h',
562 'browser/sync/notifier/chrome_system_resources.cc', 569 'browser/sync/notifier/chrome_system_resources.cc',
563 'browser/sync/notifier/chrome_system_resources.h', 570 'browser/sync/notifier/chrome_system_resources.h',
564 'browser/sync/notifier/invalidation_notifier.h', 571 'browser/sync/notifier/invalidation_notifier.h',
565 'browser/sync/notifier/invalidation_notifier.cc', 572 'browser/sync/notifier/invalidation_notifier.cc',
566 'browser/sync/notifier/invalidation_util.cc', 573 'browser/sync/notifier/invalidation_util.cc',
(...skipping 23 matching lines...) Expand all
590 # cacheinvalidation (which itself has hard_dependency set). 597 # cacheinvalidation (which itself has hard_dependency set).
591 'hard_dependency': 1, 598 'hard_dependency': 1,
592 'export_dependent_settings': [ 599 'export_dependent_settings': [
593 '../jingle/jingle.gyp:notifier', 600 '../jingle/jingle.gyp:notifier',
594 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', 601 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n',
595 ], 602 ],
596 }, 603 },
597 { 604 {
598 'target_name': 'service', 605 'target_name': 'service',
599 'type': 'static_library', 606 'type': 'static_library',
607 'variables': { 'enable_wexit_time_destructors': 1, },
600 'dependencies': [ 608 'dependencies': [
601 'chrome_resources.gyp:chrome_strings', 609 'chrome_resources.gyp:chrome_strings',
602 'common', 610 'common',
603 'common_net', 611 'common_net',
604 '../base/base.gyp:base', 612 '../base/base.gyp:base',
605 '../jingle/jingle.gyp:notifier', 613 '../jingle/jingle.gyp:notifier',
606 '../net/net.gyp:net', 614 '../net/net.gyp:net',
607 '../printing/printing.gyp:printing', 615 '../printing/printing.gyp:printing',
608 '../skia/skia.gyp:skia', 616 '../skia/skia.gyp:skia',
609 '../third_party/libjingle/libjingle.gyp:libjingle', 617 '../third_party/libjingle/libjingle.gyp:libjingle',
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 ], 688 ],
681 'sources': [ 689 'sources': [
682 'service/cloud_print/print_system_cups.cc', 690 'service/cloud_print/print_system_cups.cc',
683 ], 691 ],
684 }], 692 }],
685 ], 693 ],
686 }, 694 },
687 { 695 {
688 'target_name': 'ipclist', 696 'target_name': 'ipclist',
689 'type': 'executable', 697 'type': 'executable',
698 'variables': { 'enable_wexit_time_destructors': 1, },
690 'dependencies': [ 699 'dependencies': [
691 'test_support_common', 700 'test_support_common',
692 '../skia/skia.gyp:skia', 701 '../skia/skia.gyp:skia',
693 ], 702 ],
694 'include_dirs': [ 703 'include_dirs': [
695 '..', 704 '..',
696 ], 705 ],
697 'sources': [ 706 'sources': [
698 'tools/ipclist/ipclist.cc', 707 'tools/ipclist/ipclist.cc',
699 ], 708 ],
700 }, 709 },
701 ], 710 ],
702 'conditions': [ 711 'conditions': [
703 ['OS=="mac"', 712 ['OS=="mac"',
704 { 'targets': [ 713 { 'targets': [
705 { 714 {
706 'target_name': 'helper_app', 715 'target_name': 'helper_app',
707 'type': 'executable', 716 'type': 'executable',
717 'variables': { 'enable_wexit_time_destructors': 1, },
708 'product_name': '<(mac_product_name) Helper', 718 'product_name': '<(mac_product_name) Helper',
709 'mac_bundle': 1, 719 'mac_bundle': 1,
710 'dependencies': [ 720 'dependencies': [
711 'chrome_dll', 721 'chrome_dll',
712 'infoplist_strings_tool', 722 'infoplist_strings_tool',
713 ], 723 ],
714 'sources': [ 724 'sources': [
715 # chrome_exe_main_mac.cc's main() is the entry point for 725 # chrome_exe_main_mac.cc's main() is the entry point for
716 # the "chrome" (browser app) target. All it does is jump 726 # the "chrome" (browser app) target. All it does is jump
717 # to chrome_dll's ChromeMain. This is appropriate for 727 # to chrome_dll's ChromeMain. This is appropriate for
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves', 823 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves',
814 }, 824 },
815 }], 825 }],
816 ], 826 ],
817 }, # target helper_app 827 }, # target helper_app
818 { 828 {
819 # This produces the app mode loader, but not as a bundle. Chromium 829 # This produces the app mode loader, but not as a bundle. Chromium
820 # itself is responsible for producing bundles. 830 # itself is responsible for producing bundles.
821 'target_name': 'app_mode_app', 831 'target_name': 'app_mode_app',
822 'type': 'executable', 832 'type': 'executable',
833 'variables': { 'enable_wexit_time_destructors': 1, },
823 'product_name': '<(mac_product_name) App Mode Loader', 834 'product_name': '<(mac_product_name) App Mode Loader',
824 'sources': [ 835 'sources': [
825 'app/app_mode_loader_mac.mm', 836 'app/app_mode_loader_mac.mm',
826 'common/mac/app_mode_common.h', 837 'common/mac/app_mode_common.h',
827 'common/mac/app_mode_common.mm', 838 'common/mac/app_mode_common.mm',
828 ], 839 ],
829 'include_dirs': [ 840 'include_dirs': [
830 '..', 841 '..',
831 ], 842 ],
832 'link_settings': { 843 'link_settings': {
(...skipping 28 matching lines...) Expand all
861 'action_name': 'build_app_dmg', 872 'action_name': 'build_app_dmg',
862 'action': ['<(build_app_dmg_script_path)', '<@(branding)'], 873 'action': ['<(build_app_dmg_script_path)', '<@(branding)'],
863 }, 874 },
864 ], # 'actions' 875 ], # 'actions'
865 }, 876 },
866 { 877 {
867 # Dummy target to allow chrome to require plugin_carbon_interpose to 878 # Dummy target to allow chrome to require plugin_carbon_interpose to
868 # build without actually linking to the resulting library. 879 # build without actually linking to the resulting library.
869 'target_name': 'interpose_dependency_shim', 880 'target_name': 'interpose_dependency_shim',
870 'type': 'executable', 881 'type': 'executable',
882 'variables': { 'enable_wexit_time_destructors': 1, },
871 'dependencies': [ 883 'dependencies': [
872 'plugin_carbon_interpose', 884 'plugin_carbon_interpose',
873 ], 885 ],
874 # In release, we end up with a strip step that is unhappy if there is 886 # In release, we end up with a strip step that is unhappy if there is
875 # no binary. Rather than check in a new file for this temporary hack, 887 # no binary. Rather than check in a new file for this temporary hack,
876 # just generate a source file on the fly. 888 # just generate a source file on the fly.
877 'actions': [ 889 'actions': [
878 { 890 {
879 'action_name': 'generate_stub_main', 891 'action_name': 'generate_stub_main',
880 'process_outputs_as_sources': 1, 892 'process_outputs_as_sources': 1,
881 'inputs': [], 893 'inputs': [],
882 'outputs': [ '<(INTERMEDIATE_DIR)/dummy_main.c' ], 894 'outputs': [ '<(INTERMEDIATE_DIR)/dummy_main.c' ],
883 'action': [ 895 'action': [
884 'bash', '-c', 896 'bash', '-c',
885 'echo "int main() { return 0; }" > <(INTERMEDIATE_DIR)/dummy_mai n.c' 897 'echo "int main() { return 0; }" > <(INTERMEDIATE_DIR)/dummy_mai n.c'
886 ], 898 ],
887 }, 899 },
888 ], 900 ],
889 }, 901 },
890 { 902 {
891 # dylib for interposing Carbon calls in the plugin process. 903 # dylib for interposing Carbon calls in the plugin process.
892 'target_name': 'plugin_carbon_interpose', 904 'target_name': 'plugin_carbon_interpose',
893 'type': 'shared_library', 905 'type': 'shared_library',
906 'variables': { 'enable_wexit_time_destructors': 1, },
894 'dependencies': [ 907 'dependencies': [
895 'chrome_dll', 908 'chrome_dll',
896 ], 909 ],
897 'sources': [ 910 'sources': [
898 '../content/plugin/plugin_carbon_interpose_mac.cc', 911 '../content/plugin/plugin_carbon_interpose_mac.cc',
899 ], 912 ],
900 'include_dirs': [ 913 'include_dirs': [
901 '..', 914 '..',
902 ], 915 ],
903 'link_settings': { 916 'link_settings': {
(...skipping 19 matching lines...) Expand all
923 '@executable_path/../Versions/<(version_full)/<(mac_product_name ) Framework.framework/<(mac_product_name) Framework', 936 '@executable_path/../Versions/<(version_full)/<(mac_product_name ) Framework.framework/<(mac_product_name) Framework',
924 '@executable_path/../../../<(mac_product_name) Framework.framewo rk/<(mac_product_name) Framework', 937 '@executable_path/../../../<(mac_product_name) Framework.framewo rk/<(mac_product_name) Framework',
925 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}' 938 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
926 ], 939 ],
927 }, 940 },
928 ], 941 ],
929 }, 942 },
930 { 943 {
931 'target_name': 'infoplist_strings_tool', 944 'target_name': 'infoplist_strings_tool',
932 'type': 'executable', 945 'type': 'executable',
946 'variables': { 'enable_wexit_time_destructors': 1, },
933 'dependencies': [ 947 'dependencies': [
934 'chrome_resources.gyp:chrome_strings', 948 'chrome_resources.gyp:chrome_strings',
935 '../base/base.gyp:base', 949 '../base/base.gyp:base',
936 '../ui/ui.gyp:ui', 950 '../ui/ui.gyp:ui',
937 ], 951 ],
938 'include_dirs': [ 952 'include_dirs': [
939 '<(grit_out_dir)', 953 '<(grit_out_dir)',
940 ], 954 ],
941 'sources': [ 955 'sources': [
942 'tools/mac_helpers/infoplist_strings_util.mm', 956 'tools/mac_helpers/infoplist_strings_util.mm',
943 ], 957 ],
944 }, 958 },
945 ], # targets 959 ], # targets
946 }, { # else: OS != "mac" 960 }, { # else: OS != "mac"
947 'targets': [ 961 'targets': [
948 { 962 {
949 'target_name': 'convert_dict', 963 'target_name': 'convert_dict',
950 'type': 'executable', 964 'type': 'executable',
965 'variables': { 'enable_wexit_time_destructors': 1, },
951 'dependencies': [ 966 'dependencies': [
952 '../base/base.gyp:base', 967 '../base/base.gyp:base',
953 '../base/base.gyp:base_i18n', 968 '../base/base.gyp:base_i18n',
954 'convert_dict_lib', 969 'convert_dict_lib',
955 '../third_party/hunspell/hunspell.gyp:hunspell', 970 '../third_party/hunspell/hunspell.gyp:hunspell',
956 ], 971 ],
957 'sources': [ 972 'sources': [
958 'tools/convert_dict/convert_dict.cc', 973 'tools/convert_dict/convert_dict.cc',
959 ], 974 ],
960 }, 975 },
961 { 976 {
962 'target_name': 'convert_dict_lib', 977 'target_name': 'convert_dict_lib',
963 'product_name': 'convert_dict', 978 'product_name': 'convert_dict',
964 'type': 'static_library', 979 'type': 'static_library',
980 'variables': { 'enable_wexit_time_destructors': 1, },
965 'include_dirs': [ 981 'include_dirs': [
966 '..', 982 '..',
967 ], 983 ],
968 'dependencies': [ 984 'dependencies': [
969 '../base/base.gyp:base', 985 '../base/base.gyp:base',
970 ], 986 ],
971 'sources': [ 987 'sources': [
972 'tools/convert_dict/aff_reader.cc', 988 'tools/convert_dict/aff_reader.cc',
973 'tools/convert_dict/aff_reader.h', 989 'tools/convert_dict/aff_reader.h',
974 'tools/convert_dict/dic_reader.cc', 990 'tools/convert_dict/dic_reader.cc',
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 'configurations': { 1318 'configurations': {
1303 'Common_Base': { 1319 'Common_Base': {
1304 'msvs_target_platform': 'x64', 1320 'msvs_target_platform': 'x64',
1305 }, 1321 },
1306 }, 1322 },
1307 }, 1323 },
1308 ]}, # 'targets' 1324 ]}, # 'targets'
1309 ], # OS=="win" 1325 ], # OS=="win"
1310 ], # 'conditions' 1326 ], # 'conditions'
1311 } 1327 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/network_menu_icon.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698