Commit a933db1a authored by dpapad's avatar dpapad Committed by Commit Bot

WebUI: Reduce unnecessarily wide deps in js_library() targets.

 - Remove |deps| field from js_modulizer() definition.
 - Spit js_modulizer() targets with deps to two separate targets, one
   js_modulizer() and one group() target.
 - Change js_library() targets to only depend on "modulize_local"
   targets.

Bug: None
Change-Id: Ifb0ed2344f3ecc9e6699f88fc0676d339b2d3424
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2514071
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823397}
parent cc48ac12
...@@ -41,7 +41,6 @@ group("polymer3_elements") { ...@@ -41,7 +41,6 @@ group("polymer3_elements") {
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ "cr_radio_button_behavior.js" ] input_files = [ "cr_radio_button_behavior.js" ]
deps = [ "//third_party/polymer/v3_0/components-chromium/paper-behaviors:paper-ripple-behavior" ]
namespace_rewrites = [ "Polymer.PaperRippleBehavior|PaperRippleBehavior" ] namespace_rewrites = [ "Polymer.PaperRippleBehavior|PaperRippleBehavior" ]
} }
......
...@@ -36,7 +36,6 @@ group("polymer3_elements") { ...@@ -36,7 +36,6 @@ group("polymer3_elements") {
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ "cr_search_field_behavior.js" ] input_files = [ "cr_search_field_behavior.js" ]
deps = []
} }
polymer_modulizer("cr_search_field") { polymer_modulizer("cr_search_field") {
......
...@@ -115,7 +115,14 @@ js_library("webui_resource_test") { ...@@ -115,7 +115,14 @@ js_library("webui_resource_test") {
# Targets for auto-generating and type-checking JS Modules # Targets for auto-generating and type-checking JS Modules
js_modulizer("modulize") { group("modulize") {
public_deps = [
":modulize_local",
"cr:modulize",
]
}
js_modulizer("modulize_local") {
input_files = [ input_files = [
"assert.js", "assert.js",
"event_tracker.js", "event_tracker.js",
...@@ -133,7 +140,6 @@ js_modulizer("modulize") { ...@@ -133,7 +140,6 @@ js_modulizer("modulize") {
"cr.search_highlight_utils.Range|Range", "cr.search_highlight_utils.Range|Range",
"Polymer.ArraySplice.calculateSplices|calculateSplices", "Polymer.ArraySplice.calculateSplices|calculateSplices",
] ]
deps = [ "cr:modulize" ]
} }
group("closure_compile_modules") { group("closure_compile_modules") {
...@@ -164,7 +170,7 @@ js_type_check("js_resources_modules") { ...@@ -164,7 +170,7 @@ js_type_check("js_resources_modules") {
js_library("assert.m") { js_library("assert.m") {
sources = [ "$root_gen_dir/ui/webui/resources/js/assert.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/js/assert.m.js" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("cr.m") { js_library("cr.m") {
...@@ -177,13 +183,13 @@ js_library("cr.m") { ...@@ -177,13 +183,13 @@ js_library("cr.m") {
js_library("event_tracker.m") { js_library("event_tracker.m") {
sources = [ "$root_gen_dir/ui/webui/resources/js/event_tracker.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/js/event_tracker.m.js" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("icon.m") { js_library("icon.m") {
sources = [ "$root_gen_dir/ui/webui/resources/js/icon.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/js/icon.m.js" ]
deps = [ ":cr.m" ] deps = [ ":cr.m" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("i18n_behavior.m") { js_library("i18n_behavior.m") {
...@@ -192,7 +198,7 @@ js_library("i18n_behavior.m") { ...@@ -192,7 +198,7 @@ js_library("i18n_behavior.m") {
":load_time_data.m", ":load_time_data.m",
":parse_html_subset.m", ":parse_html_subset.m",
] ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("list_property_update_behavior.m") { js_library("list_property_update_behavior.m") {
...@@ -202,7 +208,7 @@ js_library("list_property_update_behavior.m") { ...@@ -202,7 +208,7 @@ js_library("list_property_update_behavior.m") {
deps = [ deps = [
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
] ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("load_time_data.m") { js_library("load_time_data.m") {
...@@ -212,12 +218,12 @@ js_library("load_time_data.m") { ...@@ -212,12 +218,12 @@ js_library("load_time_data.m") {
":parse_html_subset.m", ":parse_html_subset.m",
"//third_party/jstemplate:jstemplate", "//third_party/jstemplate:jstemplate",
] ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("parse_html_subset.m") { js_library("parse_html_subset.m") {
sources = [ "$root_gen_dir/ui/webui/resources/js/parse_html_subset.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/js/parse_html_subset.m.js" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("plural_string_proxy") { js_library("plural_string_proxy") {
...@@ -227,14 +233,14 @@ js_library("plural_string_proxy") { ...@@ -227,14 +233,14 @@ js_library("plural_string_proxy") {
js_library("promise_resolver.m") { js_library("promise_resolver.m") {
sources = [ "$root_gen_dir/ui/webui/resources/js/promise_resolver.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/js/promise_resolver.m.js" ]
deps = [ ":assert.m" ] deps = [ ":assert.m" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("search_highlight_utils.m") { js_library("search_highlight_utils.m") {
sources = sources =
[ "$root_gen_dir/ui/webui/resources/js/search_highlight_utils.m.js" ] [ "$root_gen_dir/ui/webui/resources/js/search_highlight_utils.m.js" ]
deps = [ ":assert.m" ] deps = [ ":assert.m" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("util.m") { js_library("util.m") {
...@@ -244,12 +250,12 @@ js_library("util.m") { ...@@ -244,12 +250,12 @@ js_library("util.m") {
":cr.m", ":cr.m",
] ]
externs_list = [ "$externs_path/chrome_send.js" ] externs_list = [ "$externs_path/chrome_send.js" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("web_ui_listener_behavior.m") { js_library("web_ui_listener_behavior.m") {
sources = sources =
[ "$root_gen_dir/ui/webui/resources/js/web_ui_listener_behavior.m.js" ] [ "$root_gen_dir/ui/webui/resources/js/web_ui_listener_behavior.m.js" ]
deps = [ ":cr.m" ] deps = [ ":cr.m" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
...@@ -30,18 +30,24 @@ js_library("ui") { ...@@ -30,18 +30,24 @@ js_library("ui") {
js_library("event_target.m") { js_library("event_target.m") {
sources = [ "$root_gen_dir/ui/webui/resources/js/cr/event_target.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/js/cr/event_target.m.js" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_library("ui.m") { js_library("ui.m") {
sources = [ "$root_gen_dir/ui/webui/resources/js/cr/ui.m.js" ] sources = [ "$root_gen_dir/ui/webui/resources/js/cr/ui.m.js" ]
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize_local" ]
} }
js_modulizer("modulize") { group("modulize") {
public_deps = [
":modulize_local",
"ui:modulize",
]
}
js_modulizer("modulize_local") {
input_files = [ input_files = [
"event_target.js", "event_target.js",
"ui.js", "ui.js",
] ]
deps = [ "ui:modulize" ]
} }
...@@ -60,9 +60,5 @@ template("js_modulizer") { ...@@ -60,9 +60,5 @@ template("js_modulizer") {
if (defined(invoker.namespace_rewrites)) { if (defined(invoker.namespace_rewrites)) {
args += invoker.namespace_rewrites args += invoker.namespace_rewrites
} }
if (defined(invoker.deps)) {
deps = invoker.deps
}
} }
} }
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