summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_features.gypi
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2016-02-25 12:07:45 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-25 20:09:02 +0000
commit3224f3c8a421d9db7f252c9294553378076bd9aa (patch)
treecfecad08e9664338e3c49ec8d5aa9871cf7a592a /chrome/chrome_features.gypi
parentc9332a02c50696fd24323176099aae2a69162d02 (diff)
downloadchromium_src-3224f3c8a421d9db7f252c9294553378076bd9aa.zip
chromium_src-3224f3c8a421d9db7f252c9294553378076bd9aa.tar.gz
chromium_src-3224f3c8a421d9db7f252c9294553378076bd9aa.tar.bz2
Convert enable_background to new-style build flag.
This flag is only used in a cople of places at the Chrome layer. Remove it from the shared build files. BUG=589674 Review URL: https://codereview.chromium.org/1739543002 Cr-Commit-Position: refs/heads/master@{#377651}
Diffstat (limited to 'chrome/chrome_features.gypi')
-rw-r--r--chrome/chrome_features.gypi4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/chrome_features.gypi b/chrome/chrome_features.gypi
index b93f6a5..3c80aa0 100644
--- a/chrome/chrome_features.gypi
+++ b/chrome/chrome_features.gypi
@@ -16,8 +16,10 @@
'android_java_ui': 0,
}],
['OS=="android" or OS=="ios"', {
+ 'enable_background%': 0,
'enable_google_now%': 0,
}, {
+ 'enable_background%': 1,
'enable_google_now%': 1,
}]
],
@@ -29,6 +31,7 @@
# Anything in the conditions needs to be copied to the outer scope to be
# accessible.
+ 'enable_background%': '<(enable_background)',
'enable_google_now%': '<(enable_google_now)',
'android_java_ui%': '<(android_java_ui)',
'use_vulcanize%': '<(use_vulcanize)',
@@ -39,6 +42,7 @@
# Grit defines based on the feature flags. These must be manually added to
# grit targets.
'chrome_grit_defines': [
+ '-D', 'enable_background=<(enable_background)',
'-D', 'enable_google_now=<(enable_google_now)',
'-D', 'use_vulcanize=<(use_vulcanize)',
],