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

Unified Diff: build/common.gypi

Issue 216923006: Add a component updater for the CLD2 data file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix windows file path literals, change android flags back to normal Created 6 years, 8 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 | « no previous file | chrome/browser/chrome_browser_main.cc » ('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 06036df682af56308937f8c931660f37578eadc8..073e79435f3e10c992623772a554d65384c31f2a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -442,6 +442,14 @@
# be loaded at runtime.
'cld2_dynamic%': 0,
+ # Whether CLD2 is a component. Only evaluated if cld_version == 2 and
+ # cld2_dynamic == 1.
+ # 0: Not a component. If cld2_dynamic == 1, it is up to the distribution
+ # to ensure that the data file is provided if desired.
+ # 1: Componentized. CLD data should be obtained via the Component
+ # Updater.
+ 'cld2_is_component%': 0,
+
# Enable spell checker.
'enable_spellcheck%': 1,
@@ -642,6 +650,7 @@
'enable_google_now%': 0,
'cld_version%': 1,
'cld2_dynamic%': 0,
+ 'cld2_is_component%': 0,
'enable_spellcheck%': 0,
'enable_themes%': 0,
'remoting%': 0,
@@ -1011,6 +1020,7 @@
'cld_version%': '<(cld_version)',
'cld2_table_size%': '<(cld2_table_size)',
'cld2_dynamic%': '<(cld2_dynamic)',
+ 'cld2_is_component%': '<(cld2_is_component)',
'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
'disable_ftp_support%': '<(disable_ftp_support)',
'enable_task_manager%': '<(enable_task_manager)',
@@ -2543,6 +2553,9 @@
['cld2_dynamic!=0', {
'defines': ['CLD2_DYNAMIC_MODE=1'],
}],
+ ['cld2_is_component!=0', {
+ 'defines': ['CLD2_IS_COMPONENT=1'],
+ }],
['enable_printing==1', {
'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'],
}],
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698