diff options
| author | tfarina <tfarina@chromium.org> | 2015-10-27 14:37:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 21:38:28 +0000 |
| commit | c2103c407dbce8f4fb29c4332d87812300a10a57 (patch) | |
| tree | 61e5e0c5fa47c7747c7dae900cfba030c04c16e0 | |
| parent | c89130e28fd01062104e1be7f3a6fc3abbb80ca9 (diff) | |
| download | chromium_src-c2103c407dbce8f4fb29c4332d87812300a10a57.zip chromium_src-c2103c407dbce8f4fb29c4332d87812300a10a57.tar.gz chromium_src-c2103c407dbce8f4fb29c4332d87812300a10a57.tar.bz2 | |
Output webkit_version.h into the target_gen_dir.
And update callers to include it like build/util/webkit_version.h.
BUG=None
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/1418623009
Cr-Commit-Position: refs/heads/master@{#356401}
| -rw-r--r-- | build/util/BUILD.gn | 2 | ||||
| -rw-r--r-- | content/common/user_agent.cc | 4 | ||||
| -rw-r--r-- | content/content_common.gypi | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/build/util/BUILD.gn b/build/util/BUILD.gn index b7d8c56..ad6f2ea 100644 --- a/build/util/BUILD.gn +++ b/build/util/BUILD.gn @@ -13,7 +13,7 @@ action("webkit_version") { template_file, ] - output_file = "$root_gen_dir/webkit_version.h" + output_file = "$target_gen_dir/webkit_version.h" outputs = [ output_file, ] diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc index 467ad97..d6f3aaa 100644 --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc @@ -9,6 +9,7 @@ #include "base/strings/stringprintf.h" #include "base/sys_info.h" #include "build/build_config.h" +#include "build/util/webkit_version.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) #include <sys/utsname.h> @@ -18,9 +19,6 @@ #include "base/win/windows_version.h" #endif -// Generated -#include "webkit_version.h" // NOLINT - namespace content { std::string GetWebKitVersion() { diff --git a/content/content_common.gypi b/content/content_common.gypi index 4e253f8..347f02a 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -644,7 +644,7 @@ '<(template)', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/webkit_version.h', + '<(SHARED_INTERMEDIATE_DIR)/build/util/webkit_version.h', ], 'action': ['python', '<(script)', |