Commit 5e73a126 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Remove unnecessary uses of source_is_generated from //chrome

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: I25ee07e95cf7744428c95cc19141b3ab4c0d5bf7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090030Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarJoe Mason <joenotcharles@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748358}
parent 28cff5e2
...@@ -5528,7 +5528,7 @@ proto_library("permissions_proto") { ...@@ -5528,7 +5528,7 @@ proto_library("permissions_proto") {
grit("resources") { grit("resources") {
source = "browser_resources.grd" source = "browser_resources.grd"
# The .grd contains references to generated files. # Required due to flattenhtml="true" on a generated file.
source_is_generated = true source_is_generated = true
use_brotli = true use_brotli = true
...@@ -5643,9 +5643,6 @@ if (is_chrome_branded) { ...@@ -5643,9 +5643,6 @@ if (is_chrome_branded) {
grit("dev_ui_browser_resources") { grit("dev_ui_browser_resources") {
source = "dev_ui_browser_resources.grd" source = "dev_ui_browser_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
defines = chrome_grit_defines defines = chrome_grit_defines
output_dir = "$root_gen_dir/chrome" output_dir = "$root_gen_dir/chrome"
......
...@@ -69,8 +69,6 @@ js_library("page_manager") { ...@@ -69,8 +69,6 @@ js_library("page_manager") {
grit("resources") { grit("resources") {
source = "resources.grd" source = "resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
outputs = [ outputs = [
"grit/bluetooth_internals_resources.h", "grit/bluetooth_internals_resources.h",
"grit/bluetooth_internals_resources_map.h", "grit/bluetooth_internals_resources_map.h",
......
...@@ -35,8 +35,6 @@ if (optimize_webui) { ...@@ -35,8 +35,6 @@ if (optimize_webui) {
grit("flattened_resources") { grit("flattened_resources") {
source = "bookmarks_resources.grd" source = "bookmarks_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
grit_flags = [ grit_flags = [
"-E", "-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
...@@ -55,7 +53,7 @@ if (optimize_webui) { ...@@ -55,7 +53,7 @@ if (optimize_webui) {
} }
group("polymer3_elements") { group("polymer3_elements") {
deps = [ public_deps = [
":app_module", ":app_module",
":command_manager_module", ":command_manager_module",
":edit_dialog_module", ":edit_dialog_module",
......
...@@ -51,9 +51,6 @@ grit("camera_resources") { ...@@ -51,9 +51,6 @@ grit("camera_resources") {
"//media/capture/video/chromeos/mojom:cros_camera_js", "//media/capture/video/chromeos/mojom:cros_camera_js",
] ]
# The .grd contains references to generated files.
source_is_generated = true
grit_flags = [ grit_flags = [
"-E", "-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
......
...@@ -39,9 +39,6 @@ if (optimize_webui) { ...@@ -39,9 +39,6 @@ if (optimize_webui) {
grit("flattened_resources") { grit("flattened_resources") {
source = "downloads_resources.grd" source = "downloads_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
defines = chrome_grit_defines defines = chrome_grit_defines
outputs = [ outputs = [
"grit/downloads_resources.h", "grit/downloads_resources.h",
...@@ -147,7 +144,7 @@ js_library("toolbar") { ...@@ -147,7 +144,7 @@ js_library("toolbar") {
} }
group("polymer3_elements") { group("polymer3_elements") {
deps = [ public_deps = [
":icons_module", ":icons_module",
":item_module", ":item_module",
":manager_module", ":manager_module",
......
...@@ -35,8 +35,6 @@ if (optimize_webui) { ...@@ -35,8 +35,6 @@ if (optimize_webui) {
grit("flattened_resources") { grit("flattened_resources") {
source = "extensions_resources.grd" source = "extensions_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
grit_flags = [ grit_flags = [
"-E", "-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
...@@ -62,7 +60,7 @@ group("closure_compile") { ...@@ -62,7 +60,7 @@ group("closure_compile") {
} }
group("polymer3_elements") { group("polymer3_elements") {
deps = [ public_deps = [
":checkup_module", ":checkup_module",
":code_section_module", ":code_section_module",
":detail_view_module", ":detail_view_module",
...@@ -90,7 +88,7 @@ group("polymer3_elements") { ...@@ -90,7 +88,7 @@ group("polymer3_elements") {
"activity_log:polymer3_elements", "activity_log:polymer3_elements",
] ]
if (is_chromeos) { if (is_chromeos) {
deps += [ ":kiosk_dialog_module" ] public_deps += [ ":kiosk_dialog_module" ]
} }
} }
......
...@@ -36,7 +36,7 @@ polymer_modulizer("activity_log_stream_item") { ...@@ -36,7 +36,7 @@ polymer_modulizer("activity_log_stream_item") {
} }
group("polymer3_elements") { group("polymer3_elements") {
deps = [ public_deps = [
":activity_log_history_item_module", ":activity_log_history_item_module",
":activity_log_history_module", ":activity_log_history_module",
":activity_log_module", ":activity_log_module",
......
...@@ -42,8 +42,6 @@ if (optimize_webui) { ...@@ -42,8 +42,6 @@ if (optimize_webui) {
grit("flattened_resources") { grit("flattened_resources") {
source = "history_resources.grd" source = "history_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
grit_flags = [ grit_flags = [
"-E", "-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
...@@ -216,7 +214,7 @@ js_library("synced_device_manager") { ...@@ -216,7 +214,7 @@ js_library("synced_device_manager") {
} }
group("polymer3_elements") { group("polymer3_elements") {
deps = [ public_deps = [
":app_module", ":app_module",
":history_item_module", ":history_item_module",
":history_list_module", ":history_list_module",
......
...@@ -7,8 +7,6 @@ import("//tools/grit/grit_rule.gni") ...@@ -7,8 +7,6 @@ import("//tools/grit/grit_rule.gni")
grit("webrtc_logs_resources") { grit("webrtc_logs_resources") {
source = "webrtc_logs_resources.grd" source = "webrtc_logs_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
use_brotli = true use_brotli = true
outputs = [ outputs = [
"grit/webrtc_logs_resources.h", "grit/webrtc_logs_resources.h",
......
...@@ -53,8 +53,6 @@ js_library("omnibox_popup") { ...@@ -53,8 +53,6 @@ js_library("omnibox_popup") {
grit("resources") { grit("resources") {
source = "resources.grd" source = "resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
outputs = [ outputs = [
"grit/omnibox_resources.h", "grit/omnibox_resources.h",
"omnibox_resources.pak", "omnibox_resources.pak",
......
...@@ -38,8 +38,6 @@ if (optimize_webui) { ...@@ -38,8 +38,6 @@ if (optimize_webui) {
grit("flattened_resources") { grit("flattened_resources") {
source = "print_preview_resources.grd" source = "print_preview_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
grit_flags = [ grit_flags = [
"-E", "-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
......
...@@ -483,7 +483,7 @@ js_library("highlight_utils") { ...@@ -483,7 +483,7 @@ js_library("highlight_utils") {
} }
group("polymer3_elements") { group("polymer3_elements") {
deps = [ public_deps = [
":advanced_options_settings_module", ":advanced_options_settings_module",
":advanced_settings_dialog_module", ":advanced_settings_dialog_module",
":advanced_settings_item_module", ":advanced_settings_item_module",
......
...@@ -59,8 +59,6 @@ if (optimize_webui) { ...@@ -59,8 +59,6 @@ if (optimize_webui) {
grit("flattened_resources") { grit("flattened_resources") {
source = "settings_resources.grd" source = "settings_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
grit_flags = [ grit_flags = [
"-E", "-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
......
...@@ -55,9 +55,6 @@ if (optimize_webui) { ...@@ -55,9 +55,6 @@ if (optimize_webui) {
grit("flattened_resources") { grit("flattened_resources") {
source = "../os_settings_resources.grd" source = "../os_settings_resources.grd"
# The .grd contains references to generated files.
source_is_generated = true
defines = chrome_grit_defines defines = chrome_grit_defines
outputs = [ outputs = [
"grit/os_settings_resources.h", "grit/os_settings_resources.h",
......
...@@ -36,9 +36,6 @@ grit("test_resources") { ...@@ -36,9 +36,6 @@ grit("test_resources") {
source = "test_resources.grd" source = "test_resources.grd"
resource_ids = "resource_ids" resource_ids = "resource_ids"
# The .grd contains references to generated files.
source_is_generated = true
outputs = [ outputs = [
"grit/test_resources.h", "grit/test_resources.h",
"test_resources.rc", "test_resources.rc",
......
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