Commit ef47dcff authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

android_webview: Add missing grit deps and remove source_is_generated

Hoping these missing deps are causing bug 1039881

Bug: 1039881, 1054892
Change-Id: I4a1f0e400d60e6d6d97b5a64c7792c042d98c02e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088648
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747297}
parent 02eaaea2
...@@ -788,9 +788,6 @@ grit("generate_aw_strings") { ...@@ -788,9 +788,6 @@ grit("generate_aw_strings") {
grit("generate_webui_resources") { grit("generate_webui_resources") {
source = "../ui/webui/resources/webui_resources.grd" source = "../ui/webui/resources/webui_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
# webui/resources has way too many resources. The whitelist is trim this down # webui/resources has way too many resources. The whitelist is trim this down
# to a reasonable size # to a reasonable size
_whitelist = "ui/grit_resources_whitelist.txt" _whitelist = "ui/grit_resources_whitelist.txt"
...@@ -798,6 +795,8 @@ grit("generate_webui_resources") { ...@@ -798,6 +795,8 @@ grit("generate_webui_resources") {
grit_flags = [ grit_flags = [
"-w", "-w",
rebase_path(_whitelist, root_build_dir), rebase_path(_whitelist, root_build_dir),
"-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
] ]
outputs = [ outputs = [
"grit/webui_resources.h", "grit/webui_resources.h",
...@@ -805,14 +804,16 @@ grit("generate_webui_resources") { ...@@ -805,14 +804,16 @@ grit("generate_webui_resources") {
"grit/webui_resources_map.h", "grit/webui_resources_map.h",
"webui_resources.pak", "webui_resources.pak",
] ]
deps = [
"//ui/webui/resources/js:modulize",
"//ui/webui/resources/js/cr:modulize",
"//ui/webui/resources/js/cr/ui:modulize",
]
} }
grit("generate_mojo_resources") { grit("generate_mojo_resources") {
source = "../mojo/public/js/mojo_bindings_resources.grd" source = "../mojo/public/js/mojo_bindings_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
# See :generate_webui_resources for an explanation of the whitelist # See :generate_webui_resources for an explanation of the whitelist
_whitelist = "ui/grit_resources_whitelist.txt" _whitelist = "ui/grit_resources_whitelist.txt"
inputs = [ _whitelist ] inputs = [ _whitelist ]
...@@ -828,16 +829,16 @@ grit("generate_mojo_resources") { ...@@ -828,16 +829,16 @@ grit("generate_mojo_resources") {
"grit/mojo_bindings_resources_map.h", "grit/mojo_bindings_resources_map.h",
"mojo_bindings_resources.pak", "mojo_bindings_resources.pak",
] ]
deps = [ "//mojo/public/js:bindings_lite" ] deps = [
"//mojo/public/js:bindings_lite",
"//mojo/public/mojom/base:base_js",
]
} }
grit("generate_components_resources") { grit("generate_components_resources") {
# Note that dev_ui_components_resources.grd is Chrome-only, so excluded. # Note that dev_ui_components_resources.grd is Chrome-only, so excluded.
source = "../components/resources/components_resources.grd" source = "../components/resources/components_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
use_brotli = true use_brotli = true
# See :generate_webui_resources for an explanation of the whitelist # See :generate_webui_resources for an explanation of the whitelist
...@@ -851,13 +852,18 @@ grit("generate_components_resources") { ...@@ -851,13 +852,18 @@ grit("generate_components_resources") {
rebase_path(_whitelist, root_build_dir), rebase_path(_whitelist, root_build_dir),
"-E", "-E",
"about_credits_file=" + rebase_path(_about_credits_file, root_build_dir), "about_credits_file=" + rebase_path(_about_credits_file, root_build_dir),
"-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
] ]
outputs = [ outputs = [
"grit/components_resources.h", "grit/components_resources.h",
"components_resources.pak", "components_resources.pak",
] ]
deps = [ "//components/resources:about_credits" ] deps = [
"//components/resources:about_credits",
"//components/resources/ssl/ssl_error_assistant:make_ssl_error_assistant_protobuf",
]
} }
grit("generate_components_strings") { grit("generate_components_strings") {
......
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