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

Side by Side Diff: build/common.gypi

Issue 199633004: Put the syzygy targets behind a 'syzygy_optimize' flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Chris' comment. Created 6 years, 9 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
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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 'data_reduction_fallback_host%' : '', 511 'data_reduction_fallback_host%' : '',
512 'data_reduction_dev_host%' : '', 512 'data_reduction_dev_host%' : '',
513 'spdy_proxy_auth_origin%' : '', 513 'spdy_proxy_auth_origin%' : '',
514 'spdy_proxy_auth_property%' : '', 514 'spdy_proxy_auth_property%' : '',
515 'spdy_proxy_auth_value%' : '', 515 'spdy_proxy_auth_value%' : '',
516 'data_reduction_proxy_probe_url%' : '', 516 'data_reduction_proxy_probe_url%' : '',
517 'enable_mdns%' : 0, 517 'enable_mdns%' : 0,
518 'enable_enhanced_bookmarks%': 0, 518 'enable_enhanced_bookmarks%': 0,
519 'enable_hangout_services_extension%': 0, 519 'enable_hangout_services_extension%': 0,
520 520
521 # Enable the Syzygy optimization step.
522 'syzygy_optimize%': 0,
523
521 'conditions': [ 524 'conditions': [
522 # A flag for POSIX platforms 525 # A flag for POSIX platforms
523 ['OS=="win"', { 526 ['OS=="win"', {
524 'os_posix%': 0, 527 'os_posix%': 0,
525 }, { 528 }, {
526 'os_posix%': 1, 529 'os_posix%': 1,
527 }], 530 }],
528 531
529 # A flag for BSD platforms 532 # A flag for BSD platforms
530 ['OS=="freebsd" or OS=="openbsd"', { 533 ['OS=="freebsd" or OS=="openbsd"', {
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 }, { 814 }, {
812 'v8_optimized_debug%': 2, 815 'v8_optimized_debug%': 2,
813 }], 816 }],
814 817
815 # Disable various features by default on embedded. 818 # Disable various features by default on embedded.
816 ['embedded==1', { 819 ['embedded==1', {
817 'remoting%': 0, 820 'remoting%': 0,
818 'enable_printing%': 0, 821 'enable_printing%': 0,
819 }], 822 }],
820 823
821 » # By default, use ICU data file (icudtl.dat) on all platforms 824 # By default, use ICU data file (icudtl.dat) on all platforms
822 » # except when building Android WebView. 825 # except when building Android WebView.
823 » # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). 826 # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
824 ['android_webview_build==0', { 827 ['android_webview_build==0', {
825 'icu_use_data_file_flag%' : 1, 828 'icu_use_data_file_flag%' : 1,
826 }, { 829 }, {
827 'icu_use_data_file_flag%' : 0, 830 'icu_use_data_file_flag%' : 0,
828 }], 831 }],
829 ], 832 ],
830 833
831 # Set this to 1 to enable use of concatenated impulse responses 834 # Set this to 1 to enable use of concatenated impulse responses
832 # for the HRTF panner in WebAudio. 835 # for the HRTF panner in WebAudio.
833 'use_concatenated_impulse_responses': 1, 836 'use_concatenated_impulse_responses': 1,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 'chromium_win_pch%': '<(chromium_win_pch)', 935 'chromium_win_pch%': '<(chromium_win_pch)',
933 'configuration_policy%': '<(configuration_policy)', 936 'configuration_policy%': '<(configuration_policy)',
934 'safe_browsing%': '<(safe_browsing)', 937 'safe_browsing%': '<(safe_browsing)',
935 'input_speech%': '<(input_speech)', 938 'input_speech%': '<(input_speech)',
936 'notifications%': '<(notifications)', 939 'notifications%': '<(notifications)',
937 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 940 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
938 'mac_want_real_dsym%': '<(mac_want_real_dsym)', 941 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
939 'asan%': '<(asan)', 942 'asan%': '<(asan)',
940 'asan_coverage%': '<(asan_coverage)', 943 'asan_coverage%': '<(asan_coverage)',
941 'syzyasan%': '<(syzyasan)', 944 'syzyasan%': '<(syzyasan)',
945 'syzygy_optimize%': '<(syzygy_optimize)',
942 'lsan%': '<(lsan)', 946 'lsan%': '<(lsan)',
943 'msan%': '<(msan)', 947 'msan%': '<(msan)',
944 'msan_blacklist%': '<(msan_blacklist)', 948 'msan_blacklist%': '<(msan_blacklist)',
945 'tsan%': '<(tsan)', 949 'tsan%': '<(tsan)',
946 'tsan_blacklist%': '<(tsan_blacklist)', 950 'tsan_blacklist%': '<(tsan_blacklist)',
947 'use_instrumented_libraries%': '<(use_instrumented_libraries)', 951 'use_instrumented_libraries%': '<(use_instrumented_libraries)',
948 'use_custom_libcxx%': '<(use_custom_libcxx)', 952 'use_custom_libcxx%': '<(use_custom_libcxx)',
949 'clang_type_profiler%': '<(clang_type_profiler)', 953 'clang_type_profiler%': '<(clang_type_profiler)',
950 'order_profiling%': '<(order_profiling)', 954 'order_profiling%': '<(order_profiling)',
951 'order_text_section%': '<(order_text_section)', 955 'order_text_section%': '<(order_text_section)',
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 'disable_glibcxx_debug%': 0, 1285 'disable_glibcxx_debug%': 0,
1282 1286
1283 # Set to 1 to compile with the hole punching for the protected video. 1287 # Set to 1 to compile with the hole punching for the protected video.
1284 'video_hole%': 0, 1288 'video_hole%': 0,
1285 1289
1286 # Enable a new Gamepad interface. This is temporary and should go 1290 # Enable a new Gamepad interface. This is temporary and should go
1287 # away once the chrome and blink interfaces are in sync 1291 # away once the chrome and blink interfaces are in sync
1288 'enable_new_gamepad_api%': 1, 1292 'enable_new_gamepad_api%': 1,
1289 1293
1290 'conditions': [ 1294 'conditions': [
1295 # Enable the Syzygy optimization step for the official builds.
1296 ['OS=="win" and buildtype=="Official" and syzyasan!=1', {
1297 'syzygy_optimize%': 1,
scottmg 2014/03/18 17:21:13 I'm not sure if this setting gets copied out? But
Sébastien Marchand 2014/03/18 18:25:00 Yeah it works, I guess that it's because it's the
1298 }, {
1299 'syzygy_optimize%': 0,
1300 }],
1301
1291 # The version of GCC in use, set later in platforms that use GCC and have 1302 # The version of GCC in use, set later in platforms that use GCC and have
1292 # not explicitly chosen to build with clang. Currently, this means all 1303 # not explicitly chosen to build with clang. Currently, this means all
1293 # platforms except Windows, Mac and iOS. 1304 # platforms except Windows, Mac and iOS.
1294 # TODO(glider): set clang to 1 earlier for ASan and TSan builds so that 1305 # TODO(glider): set clang to 1 earlier for ASan and TSan builds so that
1295 # it takes effect here. 1306 # it takes effect here.
1296 ['os_posix==1 and OS!="mac" and OS!="ios" and clang==0 and asan==0 and lsa n==0 and tsan==0 and msan==0', { 1307 ['os_posix==1 and OS!="mac" and OS!="ios" and clang==0 and asan==0 and lsa n==0 and tsan==0 and msan==0', {
1297 'conditions': [ 1308 'conditions': [
1298 ['OS=="android"', { 1309 ['OS=="android"', {
1299 # We directly set the gcc_version since we know what we use. 1310 # We directly set the gcc_version since we know what we use.
1300 'gcc_version%': 46, 1311 'gcc_version%': 46,
(...skipping 3722 matching lines...) Expand 10 before | Expand all | Expand 10 after
5023 # settings in target dicts. SYMROOT is a special case, because many other 5034 # settings in target dicts. SYMROOT is a special case, because many other
5024 # Xcode variables depend on it, including variables such as 5035 # Xcode variables depend on it, including variables such as
5025 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5036 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5026 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5037 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5027 # files to appear (when present) in the UI as actual files and not red 5038 # files to appear (when present) in the UI as actual files and not red
5028 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5039 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5029 # and therefore SYMROOT, needs to be set at the project level. 5040 # and therefore SYMROOT, needs to be set at the project level.
5030 'SYMROOT': '<(DEPTH)/xcodebuild', 5041 'SYMROOT': '<(DEPTH)/xcodebuild',
5031 }, 5042 },
5032 } 5043 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/chrome_syzygy.gyp » ('j') | chrome/chrome_syzygy.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698