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_elf | |
| 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_elf')
| -rw-r--r-- | chrome_elf/BUILD.gn | 2 | ||||
| -rw-r--r-- | chrome_elf/DEPS | 1 | ||||
| -rw-r--r-- | chrome_elf/blacklist/test/blacklist_test.cc | 2 | ||||
| -rw-r--r-- | chrome_elf/breakpad.cc | 2 | ||||
| -rw-r--r-- | chrome_elf/chrome_elf.gyp | 3 |
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn index 1a1af75..64f5b7b 100644 --- a/chrome_elf/BUILD.gn +++ b/chrome_elf/BUILD.gn @@ -90,7 +90,7 @@ source_set("breakpad") { deps = [ ":common", "//breakpad:breakpad_handler", - "//chrome/common:version_header", + "//chrome:version_header", ] } diff --git a/chrome_elf/DEPS b/chrome_elf/DEPS index d838479..495665e 100644 --- a/chrome_elf/DEPS +++ b/chrome_elf/DEPS @@ -1,5 +1,4 @@ include_rules = [ "+sandbox", "+breakpad/src/client", - "+chrome/common/chrome_version.h", ] diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc index 09d6a73..b8f1ea2 100644 --- a/chrome_elf/blacklist/test/blacklist_test.cc +++ b/chrome_elf/blacklist/test/blacklist_test.cc @@ -13,11 +13,11 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/test_reg_util_win.h" #include "base/win/registry.h" -#include "chrome/common/chrome_version.h" #include "chrome_elf/blacklist/blacklist.h" #include "chrome_elf/blacklist/test/blacklist_test_main_dll.h" #include "chrome_elf/chrome_elf_constants.h" #include "testing/gtest/include/gtest/gtest.h" +#include "version.h" // NOLINT const wchar_t kTestDllName1[] = L"blacklist_test_dll_1.dll"; const wchar_t kTestDllName2[] = L"blacklist_test_dll_2.dll"; diff --git a/chrome_elf/breakpad.cc b/chrome_elf/breakpad.cc index d67b5dc..3c95a4f 100644 --- a/chrome_elf/breakpad.cc +++ b/chrome_elf/breakpad.cc @@ -11,8 +11,8 @@ #include "base/macros.h" #include "breakpad/src/client/windows/handler/exception_handler.h" -#include "chrome/common/chrome_version.h" #include "chrome_elf/chrome_elf_util.h" +#include "version.h" // NOLINT google_breakpad::ExceptionHandler* g_elf_breakpad = NULL; diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index 5b7998d..cbbb4b4 100644 --- a/chrome_elf/chrome_elf.gyp +++ b/chrome_elf/chrome_elf.gyp @@ -165,7 +165,7 @@ 'dependencies': [ 'chrome_elf_common', '../breakpad/breakpad.gyp:breakpad_handler', - '../chrome/common_constants.gyp:version_header', + '../chrome/chrome.gyp:chrome_version_header', ], }, ], # targets @@ -202,3 +202,4 @@ }], ], } + |