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 /chrome_elf | |
| 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 '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 64f5b7b..1a1af75 100644 --- a/chrome_elf/BUILD.gn +++ b/chrome_elf/BUILD.gn @@ -90,7 +90,7 @@ source_set("breakpad") { deps = [ ":common", "//breakpad:breakpad_handler", - "//chrome:version_header", + "//chrome/common:version_header", ] } diff --git a/chrome_elf/DEPS b/chrome_elf/DEPS index 495665e..d838479 100644 --- a/chrome_elf/DEPS +++ b/chrome_elf/DEPS @@ -1,4 +1,5 @@ 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 b8f1ea2..09d6a73 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 3c95a4f..d67b5dc 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 cbbb4b4..5b7998d 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/chrome.gyp:chrome_version_header', + '../chrome/common_constants.gyp:version_header', ], }, ], # targets @@ -202,4 +202,3 @@ }], ], } - |