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

Unified Diff: build/common.gypi

Issue 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/apk_test.gypi ('k') | build/config/BUILDCONFIG.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index d1492320f727797ac8f4fb5c39ea091aba0eacf6..83a3df61a14b7a282dbc5af352c47e6fbfef0d9e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -967,10 +967,10 @@
}],
# By default, use ICU data file (icudtl.dat) on all platforms
- # except when building Android WebView or Chromecast.
+ # except when building Android WebView.
# TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
# Set the data reduction proxy origin for Android Webview.
- ['android_webview_build==0 and android_webview_telemetry_build==0 and chromecast==0', {
+ ['android_webview_build==0 and android_webview_telemetry_build==0', {
'icu_use_data_file_flag%' : 1,
}, {
'icu_use_data_file_flag%' : 0,
@@ -2137,6 +2137,18 @@
'clang_chrome_plugins_flags': [
'<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
],
+ 'conditions': [
+ # TODO(dcheng): https://crbug.com/417463 -- work to enable this flag
+ # on all platforms is currently underway.
+ ['OS=="linux" and chromeos==0', {
+ 'clang_chrome_plugins_flags': [
+ '-Xclang',
+ '-plugin-arg-find-bad-constructs',
+ '-Xclang',
+ 'strict-virtual-specifiers',
+ ],
+ }],
+ ],
}],
['asan==1 or msan==1 or lsan==1 or tsan==1', {
'clang%': 1,
@@ -3372,11 +3384,18 @@
# "/Oy /Oy-" and warnings about overriding.
'AdditionalOptions': ['/Oy-'],
}],
+ ['asan==0', {
+ # Put data in separate COMDATs. This allows the linker
+ # to put bit-identical constants at the same address even if
+ # they're unrelated constants, which saves binary size.
+ # This optimization can't be used when ASan is enabled because
+ # it is not compatible with the ASan ODR checker.
+ 'AdditionalOptions': ['/Gw'],
+ }],
],
'AdditionalOptions': [
'/d2Zi+', # Improve debugging of Release builds.
'/Zc:inline', # Remove unreferenced COMDAT (faster links).
- '/Gw', # Put data in separate COMDATs.
'<@(win_release_extra_cflags)',
],
},
@@ -5255,6 +5274,11 @@
'VCLinkerTool': {
# Set /LTCG for the official builds.
'LinkTimeCodeGeneration': '1',
+ 'AdditionalOptions': [
+ # Set the number of LTCG code-gen threads to eight.
+ # The default is four. This gives a 5-10% link speedup.
+ '/cgthreads:8',
+ ],
},
},
'target_conditions': [
« no previous file with comments | « build/apk_test.gypi ('k') | build/config/BUILDCONFIG.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698