summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorraymes <raymes@chromium.org>2015-11-24 19:18:04 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-25 03:19:12 +0000
commit4496a9a4563bf34e624261f7dcc5f1180282ff86 (patch)
tree9173ee2aae65f9e824e07dda3685064775111b47 /chrome/chrome.gyp
parent8f7af292172d43eba1b3ea11ffecf4f8862cf0b3 (diff)
downloadchromium_src-4496a9a4563bf34e624261f7dcc5f1180282ff86.zip
chromium_src-4496a9a4563bf34e624261f7dcc5f1180282ff86.tar.gz
chromium_src-4496a9a4563bf34e624261f7dcc5f1180282ff86.tar.bz2
Revert of New build flag system, convert Google Now flag (patchset #14 id:260001 of https://codereview.chromium.org/1458653002/ )
Reason for revert: This seems to have broken webkit builders: https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder/builds/94668 Original issue's description: > New build flag system, convert Google Now flag > > This generates headers with build flags rather than forcing them all to be global. It includes an accessor wrapper so that references to the flags will fail if the proper header is not included. > > Converts Google Now to use this and remove the global google now define and grit define. > > Adds support for grit define values of "true" and "false" for ease of integration with GN (they are mapped to the corresponding Python "True" and "False"). > > Adds dependencies from the main gyp targets to the new generated feature define target. Since GYP only does hard dependencies one level, this should reduce the chance that somebody adds more of these cases and forces to add a dependency. > > Committed: https://crrev.com/3118dde528359280fa0cb3c6fc5b6323e834c514 > Cr-Commit-Position: refs/heads/master@{#361527} TBR=mark@chromium.org,spang@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1475883002 Cr-Commit-Position: refs/heads/master@{#361541}
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 9495002..cfd46cc 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -104,7 +104,6 @@
'chrome_browser_ui.gypi',
'chrome_common.gypi',
'chrome_installer_util.gypi',
- 'chrome_features.gypi',
],
'conditions': [
['OS!="ios"', {