summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_features.gypi
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-11-25 14:24:44 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-25 22:25:43 +0000
commitc7cde6acb654b2c9cef527c0e8ac262d480c9f06 (patch)
tree1732b7fd0e4832ea9b5e122b80dd74e45e50a6d0 /chrome/chrome_features.gypi
parentd4bd2aafb9eb736fa1cf3844cb389c30d91aa7db (diff)
downloadchromium_src-c7cde6acb654b2c9cef527c0e8ac262d480c9f06.zip
chromium_src-c7cde6acb654b2c9cef527c0e8ac262d480c9f06.tar.gz
chromium_src-c7cde6acb654b2c9cef527c0e8ac262d480c9f06.tar.bz2
Revert of New build flag system, convert Google Now flag (patchset #2 id:20001 of https://codereview.chromium.org/1475513006/ )
Reason for revert: https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20x64%20Builder%20%28dbg%29/builds/69779/steps/compile/logs/stdio 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. > > Reland of https://codereview.chromium.org/1458653002/ > TBR=mark@chromium.org > > Committed: https://crrev.com/cbc1cd295bc85219ad89326457cd7f5cf003d41c > Cr-Commit-Position: refs/heads/master@{#361741} TBR=mark@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1480693003 Cr-Commit-Position: refs/heads/master@{#361749}
Diffstat (limited to 'chrome/chrome_features.gypi')
-rw-r--r--chrome/chrome_features.gypi31
1 files changed, 0 insertions, 31 deletions
diff --git a/chrome/chrome_features.gypi b/chrome/chrome_features.gypi
deleted file mode 100644
index a4d8756..0000000
--- a/chrome/chrome_features.gypi
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This is the GYP equivalent of //chrome/common/features.gni.
-# Please keep in sync!
-
-{
- 'variables': {
- 'variables': {
- # Conditional variables.
- 'conditions': [
- ['OS=="android" or OS=="ios"', {
- 'enable_google_now%': 0,
- }, {
- 'enable_google_now%': 1,
- }]
- ],
- },
-
- # Anything in the conditions needs to be copied to the outer scope to be
- # accessible.
- 'enable_google_now%': '<(enable_google_now)',
-
- # Grit defines based on the feature flags. These must be manually added to
- # grit targets.
- 'chrome_grit_defines': [
- '-D', 'enable_google_now=<(enable_google_now)',
- ]
- },
-}