| Index: chrome/chrome_common.gypi
|
| diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
|
| index 1438853011749075ed4d8a868d679e0e24d4b0b0..babce6552020eaef55fe680dae20fc428f531368 100644
|
| --- a/chrome/chrome_common.gypi
|
| +++ b/chrome/chrome_common.gypi
|
| @@ -297,6 +297,7 @@
|
| # 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,
|
| @@ -314,6 +315,7 @@
|
| # 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',
|
| @@ -564,6 +566,7 @@
|
| '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',
|
| @@ -653,5 +656,16 @@
|
| '../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)',
|
| + ],
|
| + },
|
| + },
|
| ],
|
| }
|
|
|