Remove uses of source_is_generated in //ui

This will let GN validate that deps are not missed. Note: deps->public_deps needed in order to appease GN's "do you depend on the targets that produce your inputs" check (you can directly depend on them, or indirectly when listed as public_deps). Bug: 1054892 Change-Id: I1f5c752590a259cb932a6ccdf5cf61cbf33d45f2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088804 Commit-Queue: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Nico Weber <thakis@chromium.org> Reviewed-by: dpapad <dpapad@chromium.org> Cr-Commit-Position: refs/heads/master@{#748263}
Denger-Network · Mar 9, 2020 · be1ab20 · be1ab20
1 parent 114e990
commit be1ab20
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 17 deletions.
diff --git a/ui/resources/BUILD.gn b/ui/resources/BUILD.gn
@@ -44,9 +44,6 @@ grit("webui_resources_grd") {
     deps += [ "//ui/webui/resources/css:cros_colors_css" ]
   }
 
-  # The .grd contains references to generated files.
-  source_is_generated = true
-
   outputs = [
     "grit/webui_resources.h",
     "grit/webui_resources_map.cc",

diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn
@@ -14,9 +14,11 @@ group("closure_compile") {
 }
 
 group("modulize") {
-  deps = [
+  public_deps = [
     "cr_components:polymer3_elements",
     "cr_elements:polymer3_elements",
     "js:modulize",
+    "js/cr:modulize",
+    "js/cr/ui:modulize",
   ]
 }
diff --git a/ui/webui/resources/cr_components/BUILD.gn b/ui/webui/resources/cr_components/BUILD.gn
@@ -17,11 +17,11 @@ group("closure_compile") {
 }
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     "certificate_manager:polymer3_elements",
     "managed_footnote:managed_footnote_module",
   ]
   if (is_chromeos) {
-    deps += [ "chromeos:polymer3_elements" ]
+    public_deps += [ "chromeos:polymer3_elements" ]
   }
 }
diff --git a/ui/webui/resources/cr_components/certificate_manager/BUILD.gn b/ui/webui/resources/cr_components/certificate_manager/BUILD.gn
@@ -268,7 +268,7 @@ js_library("certificate_manager.m") {
 }
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":ca_trust_edit_dialog_module",
     ":certificate_delete_confirmation_dialog_module",
     ":certificate_entry_module",

diff --git a/ui/webui/resources/cr_components/chromeos/BUILD.gn b/ui/webui/resources/cr_components/chromeos/BUILD.gn
@@ -44,7 +44,7 @@ js_library("bluetooth_dialog") {
 }
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     "smb_shares:add_smb_share_dialog_module",
     "smb_shares:smb_browser_proxy_module",
   ]

diff --git a/ui/webui/resources/cr_elements/BUILD.gn b/ui/webui/resources/cr_elements/BUILD.gn
@@ -149,7 +149,7 @@ js_modulizer("modulize") {
 }
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":action_link_css_module",
     ":cr_icons_css_module",
     ":cr_page_host_style_css_module",
@@ -185,7 +185,7 @@ group("polymer3_elements") {
   ]
 
   if (is_chromeos) {
-    deps += [
+    public_deps += [
       # cr-searchable-drop-down is only used in smb and cups dialogs, both of
       # which are chromeos only.
       "chromeos:cros_color_overrides_module",

diff --git a/ui/webui/resources/cr_elements/cr_input/BUILD.gn b/ui/webui/resources/cr_elements/cr_input/BUILD.gn
@@ -17,7 +17,7 @@ js_library("cr_input") {
 }
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":cr_input_module",
     ":cr_input_style_css_module",
   ]

diff --git a/ui/webui/resources/cr_elements/cr_profile_avatar_selector/BUILD.gn b/ui/webui/resources/cr_elements/cr_profile_avatar_selector/BUILD.gn
@@ -27,7 +27,7 @@ js_library("cr_profile_avatar_selector_grid") {
 }
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":cr_profile_avatar_selector_grid_module",
     ":cr_profile_avatar_selector_module",
   ]

diff --git a/ui/webui/resources/cr_elements/cr_radio_button/BUILD.gn b/ui/webui/resources/cr_elements/cr_radio_button/BUILD.gn
@@ -21,7 +21,7 @@ js_library("cr_radio_button_behavior") {
 # Targets for auto-generating and typechecking Polymer 3 JS modules
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":cr_radio_button_module",
     ":cr_radio_button_style_css_module",
     ":modulize",

diff --git a/ui/webui/resources/cr_elements/cr_search_field/BUILD.gn b/ui/webui/resources/cr_elements/cr_search_field/BUILD.gn
@@ -28,7 +28,7 @@ js_library("cr_search_field") {
 # Targets for auto-generating and typechecking Polymer 3 JS modules
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":cr_search_field_module",
     ":modulize",
   ]

diff --git a/ui/webui/resources/cr_elements/cr_toast/BUILD.gn b/ui/webui/resources/cr_elements/cr_toast/BUILD.gn
@@ -25,7 +25,7 @@ js_library("cr_toast_manager") {
 }
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":cr_toast_manager_module",
     ":cr_toast_module",
   ]

diff --git a/ui/webui/resources/cr_elements/cr_toolbar/BUILD.gn b/ui/webui/resources/cr_elements/cr_toolbar/BUILD.gn
@@ -27,7 +27,7 @@ js_library("cr_toolbar") {
 }
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":cr_toolbar_module",
     ":cr_toolbar_search_field_module",
     ":cr_toolbar_selection_overlay_module",

diff --git a/ui/webui/resources/cr_elements/policy/BUILD.gn b/ui/webui/resources/cr_elements/policy/BUILD.gn
@@ -120,7 +120,7 @@ js_library("cr_tooltip_icon.m") {
 }
 
 group("polymer3_elements") {
-  deps = [
+  public_deps = [
     ":cr_policy_indicator_module",
     ":cr_policy_pref_indicator_module",
     ":cr_tooltip_icon_module",