diff options
Diffstat (limited to 'chromium/chrome/common_constants.gyp')
| -rw-r--r-- | chromium/chrome/common_constants.gyp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/chromium/chrome/common_constants.gyp b/chromium/chrome/common_constants.gyp index d5562755306..380e075ab60 100644 --- a/chromium/chrome/common_constants.gyp +++ b/chromium/chrome/common_constants.gyp @@ -8,16 +8,15 @@ }, 'includes': [ - 'version.gypi', + '../build/util/version.gypi', ], 'target_defaults': { 'sources': [ - # TODO(yoz): Create an extension_constants target for these. - '../extensions/common/constants.cc', - '../extensions/common/constants.h', 'common/chrome_constants.cc', 'common/chrome_constants.h', + 'common/chrome_icon_resources_win.cc', + 'common/chrome_icon_resources_win.h', 'common/chrome_paths.cc', 'common/chrome_paths.h', 'common/chrome_paths_android.cc', @@ -63,6 +62,7 @@ }, 'targets': [ { + # GN version: //chrome/common:constants 'target_name': 'common_constants', 'type': 'static_library', 'include_dirs': [ @@ -70,6 +70,8 @@ ], 'dependencies': [ '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../components/components.gyp:bookmarks_common', '../components/nacl.gyp:nacl_switches', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', ], @@ -82,11 +84,6 @@ ], }], ], - 'conditions': [ - ['toolkit_uses_gtk == 1', { - 'dependencies': ['../build/linux/system.gyp:gtk'], - }], - ], }, ], 'conditions': [ @@ -99,7 +96,8 @@ '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. ], 'dependencies': [ - '../base/base.gyp:base_nacl_win64', + '../base/base.gyp:base_win64', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', '../components/nacl.gyp:nacl_switches_win64', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', ], |