diff options
| author | mathp <mathp@chromium.org> | 2015-10-20 20:16:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 03:17:46 +0000 |
| commit | ee2ad13b341f342b83e71d4cbe27bb051a66cee9 (patch) | |
| tree | 5f4fc3a94849c7ae61bd74ad0c25c50d3511d5bf /cloud_print | |
| parent | b3e0e92c7c98c77503137ce6308f3904a3650edf (diff) | |
| download | chromium_src-ee2ad13b341f342b83e71d4cbe27bb051a66cee9.zip chromium_src-ee2ad13b341f342b83e71d4cbe27bb051a66cee9.tar.gz chromium_src-ee2ad13b341f342b83e71d4cbe27bb051a66cee9.tar.bz2 | |
Revert of Cleanup chrome/version.h handling (patchset #7 id:120001 of https://codereview.chromium.org/1405633002/ )
Reason for revert:
Appears to be breaking at least Mac GN build
Example failure: http://build.chromium.org/p/chromium.mac/builders/Mac%20GN%20%28dbg%29/builds/23114
Original issue's description:
> 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
>
> Committed: https://crrev.com/59647ecac9524d954010d3d10b539ee4a340bf94
> Cr-Commit-Position: refs/heads/master@{#355196}
TBR=brettw@chromium.org,mdempsky@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542807
Review URL: https://codereview.chromium.org/1411173003
Cr-Commit-Position: refs/heads/master@{#355231}
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 aba2e1e..8ebd5cd 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/common/chrome_version.h.in', + '<(DEPTH)/chrome/version.h.in', 'BRANDING', ], 'outputs': [ @@ -81,7 +81,7 @@ '-f', '<(branding_path)', '-f', '<(lastchange_path)', '-f', 'BRANDING', - '<(DEPTH)/chrome/common/chrome_version.h.in', + '<(DEPTH)/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 1b8396f..a6171a8 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 4365337..f6e727f 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 886f746..1595883 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/common_constants.gyp:version_header', + '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_resources', ], 'include_dirs': [ |