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 /chrome_elf/blacklist | |
| 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 'chrome_elf/blacklist')
| -rw-r--r-- | chrome_elf/blacklist/test/blacklist_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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"; |