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

Unified Diff: chrome/chrome_common.gypi

Issue 1480693003: 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 | « chrome/chrome_child.gypi ('k') | chrome/chrome_debugger.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index babce6552020eaef55fe680dae20fc428f531368..1438853011749075ed4d8a868d679e0e24d4b0b0 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -297,7 +297,6 @@
# GN: //chrome/common:common
'target_name': 'common',
'type': 'static_library',
- 'hard_dependency': 1, # Because of transitive dep on version_header.
'variables': {
'chrome_common_target': 1,
'enable_wexit_time_destructors': 1,
@@ -315,7 +314,6 @@
# TODO(gregoryd): chrome_resources and chrome_strings could be
# shared with the 64-bit target, but it does not work due to a gyp
# issue.
- 'chrome_common_features',
'installer_util',
'safe_browsing_proto',
'<(DEPTH)/base/base.gyp:base',
@@ -566,7 +564,6 @@
'common/net/x509_certificate_model_openssl.cc',
],
'dependencies': [
- 'chrome_common_features',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
@@ -656,16 +653,5 @@
'../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
],
},
- {
- # GN version: //chrome/common:features
- 'target_name': 'chrome_common_features',
- 'includes': [ '../build/buildflag_header.gypi' ],
- 'variables': {
- 'buildflag_header_path': 'chrome/common/features.h',
- 'buildflag_flags': [
- 'ENABLE_GOOGLE_NOW=<(enable_google_now)',
- ],
- },
- },
],
}
« no previous file with comments | « chrome/chrome_child.gypi ('k') | chrome/chrome_debugger.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698