diff options
| author | mathp <mathp@chromium.org> | 2015-10-21 13:53:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 20:54:55 +0000 |
| commit | 43a8e38f6318192b107626d74e75c90d8d99f885 (patch) | |
| tree | 09fe7f149029bfcab72be64b9a2a992047b53d8f /chrome/chrome_installer.gypi | |
| parent | dd1274f99b889df2a344ddf64143a307d5a67d48 (diff) | |
| download | chromium_src-43a8e38f6318192b107626d74e75c90d8d99f885.zip chromium_src-43a8e38f6318192b107626d74e75c90d8d99f885.tar.gz chromium_src-43a8e38f6318192b107626d74e75c90d8d99f885.tar.bz2 | |
Revert of Cleanup chrome/version.h handling (patchset #9 id:160001 of https://codereview.chromium.org/1405633002/ )
Reason for revert:
Causing failures on the GN build (not gyp) for Mac:
http://build.chromium.org/p/chromium.mac/builders/Mac%20GN%20%28dbg%29/builds/23191
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}
>
> Committed: https://crrev.com/31f086c2013853749cac45522eb950b9d0ab0302
> Cr-Commit-Position: refs/heads/master@{#355377}
TBR=brettw@chromium.org,mdempsky@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542807
Review URL: https://codereview.chromium.org/1418933002
Cr-Commit-Position: refs/heads/master@{#355393}
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 9811b15..b7b6a3c 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -214,12 +214,12 @@ 'target_name': 'setup', 'type': 'executable', 'dependencies': [ + 'chrome_version_header', 'installer_util', 'installer_util_strings', '../base/base.gyp:base', '../breakpad/breakpad.gyp:breakpad_handler', '../chrome/common_constants.gyp:common_constants', - '../chrome/common_constants.gyp:version_header', '../chrome_elf/chrome_elf.gyp:chrome_elf_constants', '../rlz/rlz.gyp:rlz_lib', '../third_party/zlib/zlib.gyp:zlib', |