diff options
| author | mdempsky <mdempsky@chromium.org> | 2015-10-20 17:16:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 00:17:39 +0000 |
| commit | 59647ecac9524d954010d3d10b539ee4a340bf94 (patch) | |
| tree | 76a5422887ed596a7ed2bf3d994f1c6cc212f7ac /cloud_print | |
| parent | 424c553c045cfe39c917119d5c36e038b7c41fc7 (diff) | |
| download | chromium_src-59647ecac9524d954010d3d10b539ee4a340bf94.zip chromium_src-59647ecac9524d954010d3d10b539ee4a340bf94.tar.gz chromium_src-59647ecac9524d954010d3d10b539ee4a340bf94.tar.bz2 | |
Cleanup chrome/common/chrome_version.h handling
Rename "version.h" to "chrome/common/chrome_version.h"
Update #include and GYP/GN references
Generate on all platforms
Remove redundant generated chrome/common/chrome_version.cc.version
Fix DEPS include_rules
BUG=542807
Review URL: https://codereview.chromium.org/1405633002
Cr-Commit-Position: refs/heads/master@{#355196}
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/cloud_print_resources.gyp | 4 | ||||
| -rw-r--r-- | cloud_print/service/service.gyp | 2 | ||||
| -rw-r--r-- | cloud_print/virtual_driver/win/port_monitor/BUILD.gn | 2 | ||||
| -rw-r--r-- | cloud_print/virtual_driver/win/virtual_driver.gypi | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cloud_print/cloud_print_resources.gyp b/cloud_print/cloud_print_resources.gyp index 8ebd5cd..aba2e1e 100644 --- a/cloud_print/cloud_print_resources.gyp +++ b/cloud_print/cloud_print_resources.gyp @@ -68,7 +68,7 @@ '<(version_path)', '<(branding_path)', '<(lastchange_path)', - '<(DEPTH)/chrome/version.h.in', + '<(DEPTH)/chrome/common/chrome_version.h.in', 'BRANDING', ], 'outputs': [ @@ -81,7 +81,7 @@ '-f', '<(branding_path)', '-f', '<(lastchange_path)', '-f', 'BRANDING', - '<(DEPTH)/chrome/version.h.in', + '<(DEPTH)/chrome/common/chrome_version.h.in', '<@(_outputs)', ], 'message': 'Generating version header file: <@(_outputs)', diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp index a6171a8..1b8396f 100644 --- a/cloud_print/service/service.gyp +++ b/cloud_print/service/service.gyp @@ -60,9 +60,9 @@ 'conditions': [ ['OS=="win"', { 'dependencies': [ - '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', '<(DEPTH)/chrome/chrome.gyp:launcher_support', '<(DEPTH)/chrome/common_constants.gyp:common_constants', + '<(DEPTH)/chrome/common_constants.gyp:version_header', ], }], ['OS=="win" and clang==1', { diff --git a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn index f6e727f..4365337 100644 --- a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn +++ b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn @@ -26,8 +26,8 @@ shared_library("port_monitor") { ":lib", ":resources", "//base", - "//chrome:version_header", "//chrome/common:constants", + "//chrome/common:version_header", ] libs = [ "userenv.lib" ] diff --git a/cloud_print/virtual_driver/win/virtual_driver.gypi b/cloud_print/virtual_driver/win/virtual_driver.gypi index 1595883..886f746 100644 --- a/cloud_print/virtual_driver/win/virtual_driver.gypi +++ b/cloud_print/virtual_driver/win/virtual_driver.gypi @@ -51,7 +51,7 @@ ], 'dependencies': [ 'gcp_portmon_lib<(virtual_driver_suffix)', - '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', + '<(DEPTH)/chrome/common_constants.gyp:version_header', '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_resources', ], 'include_dirs': [ |