From ead019c961af122df6070a37cc3c5b78801ed128 Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Thu, 12 Mar 2020 14:01:29 +0000 Subject: [PATCH] Remove unnecessary uses of source_is_generated This will let GN validate that deps are not missed. Bug: 1054892 Change-Id: Iac6a9f58d5b605812599012ac8ccdd86da3be497 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088685 Auto-Submit: Andrew Grieve Commit-Queue: Yaron Friedman Reviewed-by: Yaron Friedman Cr-Commit-Position: refs/heads/master@{#749647} --- chromeos/resources/BUILD.gn | 10 ---------- components/sync/driver/BUILD.gn | 2 -- content/BUILD.gn | 6 ------ headless/BUILD.gn | 1 - ios/chrome/app/resources/BUILD.gn | 3 --- ios/web/BUILD.gn | 2 +- ios/web/test/BUILD.gn | 3 --- mojo/public/js/BUILD.gn | 3 --- weblayer/BUILD.gn | 2 -- 9 files changed, 1 insertion(+), 31 deletions(-) diff --git a/chromeos/resources/BUILD.gn b/chromeos/resources/BUILD.gn index c2cdd31f961059..335a92837d55b1 100644 --- a/chromeos/resources/BUILD.gn +++ b/chromeos/resources/BUILD.gn @@ -12,8 +12,6 @@ assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos") grit("resources") { source = "chromeos_resources.grd" - source_is_generated = true - outputs = [ "grit/chromeos_resources.h", "grit/chromeos_resources_map.cc", @@ -47,8 +45,6 @@ grit("resources") { grit("help_app_resources") { source = "../components/help_app_ui/resources/help_app_resources.grd" - source_is_generated = true - outputs = [ "grit/chromeos_help_app_resources.h", "grit/chromeos_help_app_resources_map.cc", @@ -75,7 +71,6 @@ grit("help_app_bundle_resources") { source = "../components/help_app_ui/resources/mock/help_app_bundle_mock_resources.grd" } - source_is_generated = true use_brotli = true outputs = [ @@ -91,8 +86,6 @@ grit("help_app_bundle_resources") { grit("sample_system_web_app_resources") { source = "../components/sample_system_web_app_ui/resources/sample_system_web_app_resources.grd" - source_is_generated = true - outputs = [ "grit/chromeos_sample_system_web_app_resources.h", "grit/chromeos_sample_system_web_app_resources_map.cc", @@ -107,8 +100,6 @@ grit("sample_system_web_app_resources") { grit("media_app_resources") { source = "../components/media_app_ui/resources/media_app_resources.grd" - source_is_generated = true - outputs = [ "grit/chromeos_media_app_resources.h", "chromeos_media_app_resources.pak", @@ -132,7 +123,6 @@ grit("media_app_bundle_resources") { source = "../components/media_app_ui/resources/mock/media_app_bundle_mock_resources.grd" } - source_is_generated = true use_brotli = true outputs = [ diff --git a/components/sync/driver/BUILD.gn b/components/sync/driver/BUILD.gn index a7ae6cdba5c707..f4eddd7fafcfcb 100644 --- a/components/sync/driver/BUILD.gn +++ b/components/sync/driver/BUILD.gn @@ -148,8 +148,6 @@ jumbo_static_library("driver") { grit("resources") { source = "resources.grd" - # The .grd contains references to generated files. - source_is_generated = true outputs = [ "grit/sync_driver_resources.h", "sync_driver_resources.pak", diff --git a/content/BUILD.gn b/content/BUILD.gn index ec9a7a3c7b4cc5..1546f994dde5a4 100644 --- a/content/BUILD.gn +++ b/content/BUILD.gn @@ -111,9 +111,6 @@ if (is_component_build) { grit("content_resources") { source = "content_resources.grd" - # The .grd contains references to generated files. - source_is_generated = true - outputs = [ "grit/content_resources.h", "grit/content_resources_map.cc", @@ -133,9 +130,6 @@ grit("content_resources") { grit("dev_ui_content_resources") { source = "dev_ui_content_resources.grd" - # The .grd contains references to generated files. - source_is_generated = true - outputs = [ "grit/dev_ui_content_resources.h", "dev_ui_content_resources.pak", diff --git a/headless/BUILD.gn b/headless/BUILD.gn index c8359b62392aef..db85b6be51aef3 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn @@ -109,7 +109,6 @@ grit("resources") { "grit/headless_lib_resources.h", "$root_gen_dir/headless/headless_lib_resources.pak", ] - source_is_generated = true } devtools_domains = [ diff --git a/ios/chrome/app/resources/BUILD.gn b/ios/chrome/app/resources/BUILD.gn index 24111cd99bcda1..98b9b597de3de9 100644 --- a/ios/chrome/app/resources/BUILD.gn +++ b/ios/chrome/app/resources/BUILD.gn @@ -25,9 +25,6 @@ grit("ios_resources") { source = "ios_resources.grd" output_dir = "$root_gen_dir/ios/chrome" - # The .grd contains references to generated files. - source_is_generated = true - outputs = [ "grit/ios_resources.h", "ios_resources.pak", diff --git a/ios/web/BUILD.gn b/ios/web/BUILD.gn index cbf6287eea1abb..3cd3ab26f84caa 100644 --- a/ios/web/BUILD.gn +++ b/ios/web/BUILD.gn @@ -660,7 +660,7 @@ bundle_data("navigation_resources") { grit("resources") { source = "ios_web_resources.grd" - # The .grd contains references to generated files. + # Required due to flattenhtml="true" on a generated file. source_is_generated = true outputs = [ diff --git a/ios/web/test/BUILD.gn b/ios/web/test/BUILD.gn index 4afec1d578d0c8..8134126797edbd 100644 --- a/ios/web/test/BUILD.gn +++ b/ios/web/test/BUILD.gn @@ -29,9 +29,6 @@ repack("packed_resources") { grit("resources") { source = "test_resources.grd" - # The .grd contains references to generated files. - source_is_generated = true - inputs = [ "${root_gen_dir}/ios/web/test/mojo_test.mojom.js" ] deps = [ ":mojo_bindings_js" ] outputs = [ diff --git a/mojo/public/js/BUILD.gn b/mojo/public/js/BUILD.gn index 41f47e5ab2af54..c842406970e62c 100644 --- a/mojo/public/js/BUILD.gn +++ b/mojo/public/js/BUILD.gn @@ -93,9 +93,6 @@ if (enable_mojom_closure_compile || closure_compile) { grit("resources") { source = "mojo_bindings_resources.grd" - # The .grd contains references to generated files. - source_is_generated = true - outputs = [ "grit/mojo_bindings_resources.h", "grit/mojo_bindings_resources_map.cc", diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn index dead775238634c..266fa645e48208 100644 --- a/weblayer/BUILD.gn +++ b/weblayer/BUILD.gn @@ -394,8 +394,6 @@ static_library("weblayer_lib") { grit("resources") { source = "weblayer_resources.grd" - source_is_generated = true - outputs = [ "grit/weblayer_resources.h", "weblayer_resources.pak",