Commit 49911f06 authored by dconnelly's avatar dconnelly Committed by Commit bot

Revert of Use data_deps rather then deps for mojo_bindings. (patchset #1 id:1...

Revert of Use data_deps rather then deps for mojo_bindings. (patchset #1 id:1 of https://codereview.chromium.org/876783003/)

Reason for revert:
https://code.google.com/p/chromium/issues/detail?id=452847

Original issue's description:
> 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.
>
> Committed: https://crrev.com/f7b4f01989be22df44d9b5475143ef98b653b1ac
> Cr-Commit-Position: refs/heads/master@{#313126}

TBR=brettw@chromium.org,dpranke@chromium.org,vchigrin@yandex-team.ru
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/880573005

Cr-Commit-Position: refs/heads/master@{#313492}
parent 134f2b1d
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
# If set, output_dir is not added to include_dirs. # If set, output_dir is not added to include_dirs.
# #
# deps (optional) # deps (optional)
# data_deps (optional)
# visibility (optional) # visibility (optional)
# Normal meaning. # Normal meaning.
# #
...@@ -414,9 +413,6 @@ template("grit") { ...@@ -414,9 +413,6 @@ template("grit") {
if (defined(invoker.deps)) { if (defined(invoker.deps)) {
deps += 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 # This is the thing that people actually link with, it must be named the
......
...@@ -803,8 +803,9 @@ grit("resources") { ...@@ -803,8 +803,9 @@ grit("resources") {
deps = [ deps = [
":about_credits", ":about_credits",
":chrome_internal_resources_gen", ":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 # GYP version: chrome/chrome_resource.gyp:about_credits
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment