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

Unified Diff: build/common.gypi

Issue 1475883002: Revert of New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/buildflag_header.gypi ('k') | build/config/BUILD.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 02e3f3656550dd759ff1433b483e5a3b0e914fe1..6a06982dc6dc4f4a9aa82d95f3c1fd614998b04a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -547,6 +547,9 @@
# Enable Chrome browser extensions
'enable_extensions%': 1,
+ # Enable Google Now.
+ 'enable_google_now%': 1,
+
# Enable basic printing support and UI.
'enable_basic_printing%': 1,
@@ -816,6 +819,7 @@
['OS=="android"', {
'enable_extensions%': 0,
+ 'enable_google_now%': 0,
'cld2_table_size%': 0,
'enable_themes%': 0,
'remoting%': 0,
@@ -863,6 +867,7 @@
'configuration_policy%': 0,
'disable_ftp_support%': 1,
'enable_extensions%': 0,
+ 'enable_google_now%': 0,
'cld2_table_size%': 0,
'enable_basic_printing%': 0,
'enable_print_preview%': 0,
@@ -1216,6 +1221,7 @@
'enable_print_preview%': '<(enable_print_preview)',
'enable_spellcheck%': '<(enable_spellcheck)',
'use_browser_spellchecker%': '<(use_browser_spellchecker)',
+ 'enable_google_now%': '<(enable_google_now)',
'cld_version%': '<(cld_version)',
'cld2_table_size%': '<(cld2_table_size)',
'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
@@ -2177,6 +2183,9 @@
['enable_settings_app==1', {
'grit_defines': ['-D', 'enable_settings_app'],
}],
+ ['enable_google_now==1', {
+ 'grit_defines': ['-D', 'enable_google_now'],
+ }],
['use_concatenated_impulse_responses==1', {
'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
}],
@@ -2988,6 +2997,9 @@
}],
['enable_background==1', {
'defines': ['ENABLE_BACKGROUND=1'],
+ }],
+ ['enable_google_now==1', {
+ 'defines': ['ENABLE_GOOGLE_NOW=1'],
}],
['enable_basic_printing==1 or enable_print_preview==1', {
# Convenience define for ENABLE_BASIC_PRINTING || ENABLE_PRINT_PREVIEW.
« no previous file with comments | « build/buildflag_header.gypi ('k') | build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698