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

Unified Diff: build/common.gypi

Issue 22867032: Use Finch to compare the performances of CLD1 and CLD2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (rebasing) Created 7 years, 3 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/all.gyp ('k') | chrome/chrome_common.gypi » ('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 ce4cac6217d34588877e56a004cbad69219cb02a..b5396c44e36f73396bdccbe76111b9ceea9ccfcf 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -341,6 +341,12 @@
# print, UI, etc.
'enable_printing%': 1,
+ # Set the version of CLD.
+ # 0: Don't specify the version. This option is for the Finch testing.
+ # 1: Use only CLD1.
+ # 2: Use only CLD2.
+ 'cld_version%': 0,
+
# Enable spell checker.
'enable_spellcheck%': 1,
@@ -510,10 +516,15 @@
'enable_one_click_signin%': 1,
}],
+ ['OS=="win"', {
+ 'cld_version%': 1,
+ }],
+
['OS=="android"', {
'enable_automation%': 0,
'enable_extensions%': 0,
'enable_google_now%': 0,
+ 'cld_version%': 1,
'enable_spellcheck%': 0,
'enable_themes%': 0,
'remoting%': 0,
@@ -563,6 +574,7 @@
'enable_automation%': 0,
'enable_extensions%': 0,
'enable_google_now%': 0,
+ 'cld_version%': 1,
'enable_printing%': 0,
'enable_session_service%': 0,
'enable_themes%': 0,
@@ -851,6 +863,7 @@
'enable_printing%': '<(enable_printing)',
'enable_spellcheck%': '<(enable_spellcheck)',
'enable_google_now%': '<(enable_google_now)',
+ 'cld_version%': '<(cld_version)',
'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
'disable_ftp_support%': '<(disable_ftp_support)',
'enable_task_manager%': '<(enable_task_manager)',
@@ -2273,6 +2286,9 @@
['enable_google_now==1', {
'defines': ['ENABLE_GOOGLE_NOW=1'],
}],
+ ['cld_version!=0', {
+ 'defines': ['CLD_VERSION=<(cld_version)'],
+ }],
['enable_printing==1', {
'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'],
}],
« no previous file with comments | « build/all.gyp ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698