diff options
| author | vchigrin <vchigrin@yandex-team.ru> | 2015-01-26 12:44:12 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-26 20:45:27 +0000 |
| commit | f7b4f01989be22df44d9b5475143ef98b653b1ac (patch) | |
| tree | 3bab7170d3fc0872a29a1eef0e961b089a4d126f | |
| parent | 81fe0e576f9cfe564fa85bfa545de68c26b8a02c (diff) | |
| download | chromium_src-f7b4f01989be22df44d9b5475143ef98b653b1ac.zip chromium_src-f7b4f01989be22df44d9b5475143ef98b653b1ac.tar.gz chromium_src-f7b4f01989be22df44d9b5475143ef98b653b1ac.tar.bz2 | |
Use data_deps rather then deps for mojo_bindings.
Using deps caused pulling a bit of mojo code to chrome.exe. That
caused weird unresolved externatls problems during Windows GN build.
Review URL: https://codereview.chromium.org/876783003
Cr-Commit-Position: refs/heads/master@{#313126}
| -rw-r--r-- | build/secondary/tools/grit/grit_rule.gni | 4 | ||||
| -rw-r--r-- | chrome/browser/BUILD.gn | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni index 7a1cc26..9d8d604 100644 --- a/build/secondary/tools/grit/grit_rule.gni +++ b/build/secondary/tools/grit/grit_rule.gni @@ -54,6 +54,7 @@ # If set, output_dir is not added to include_dirs. # # deps (optional) +# data_deps (optional) # visibility (optional) # Normal meaning. # @@ -413,6 +414,9 @@ template("grit") { if (defined(invoker.deps)) { deps += invoker.deps } + if (defined(invoker.data_deps)) { + data_deps = invoker.data_deps + } } # This is the thing that people actually link with, it must be named the diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 0657318..110e732 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -787,9 +787,8 @@ grit("resources") { deps = [ ":about_credits", ":chrome_internal_resources_gen", - "//chrome/browser/ui/webui/omnibox:mojo_bindings", - "//mojo/environment:chromium", ] + data_deps = [ "//chrome/browser/ui/webui/omnibox:mojo_bindings" ] } # GYP version: chrome/chrome_resource.gyp:about_credits |