Settings: Autogenerate grd for non-optimized builds

Bug: 1132403
Change-Id: I8a7d2c9c9fb54cbb7394d89afa7e91398a3ce1d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460710Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815518}

chrome/browser/resources/BUILD.gn

@@ -276,16 +276,20 @@ if (!is_android) {
       "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
     ]
 
+    defines = chrome_grit_defines
     if (optimize_webui) {
       source = "settings/settings_resources_vulcanized.grd"
-
       deps = [ "//chrome/browser/resources/settings:build_polymer3" ]
     } else {
-      source = "settings/settings_resources.grd"
-      deps = [ "//chrome/browser/resources/settings:polymer3_elements" ]
+      # These arguments are needed since the grd is generated at build time.
+      enable_input_discovery_for_gn_analyze = false
+      defines += [ "SHARED_INTERMEDIATE_DIR=" +
+                   rebase_path(root_gen_dir, root_build_dir) ]
+      gen_dir = "$root_gen_dir/chrome/browser/resources/settings"
+      source = "$gen_dir/settings_resources.grd"
+      deps = [ "//chrome/browser/resources/settings:build_grd" ]
     }
 
-    defines = chrome_grit_defines
     outputs = [
       "grit/settings_resources.h",
       "grit/settings_resources_map.cc",

chrome/browser/resources/settings/settings_resources.grd

-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
-  <outputs>
-    <output filename="grit/settings_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="grit/settings_resources_map.cc"
-            type="resource_file_map_source" />
-    <output filename="grit/settings_resources_map.h"
-            type="resource_map_header" />
-    <output filename="settings_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <part file="settings_resources_v3.grdp" />
-    </includes>
-    <structures>
-      <structure name="IDR_SETTINGS_IMAGES_COOKIES_BANNER_SVG"
-                 file="images/cookies_banner.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_COOKIES_BANNER_DARK_SVG"
-                 file="images/cookies_banner_dark.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_NEUTRAL_SVG"
-                 file="images/password_check_neutral.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_NEUTRAL_DARK_SVG"
-                 file="images/password_check_neutral_dark.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_POSITIVE_SVG"
-                 file="images/password_check_positive.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_POSITIVE_DARK_SVG"
-                 file="images/password_check_positive_dark.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_PERMISSIONS_BANNER_SVG"
-                 file="images/permissions_banner.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_PERMISSIONS_BANNER_DARK_SVG"
-                 file="images/permissions_banner_dark.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_SAFE_BROWSING_BANNER_SVG"
-                 file="images/safe_browsing_banner.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_SAFE_BROWSING_BANNER_DARK_SVG"
-                 file="images/safe_browsing_banner_dark.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_SYNC_BANNER_SVG"
-                 file="images/sync_banner.svg"
-                 compress="false"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_SYNC_BANNER_DARK_SVG"
-                 file="images/sync_banner_dark.svg"
-                 compress="false"
-                 type="chrome_html" />
-    </structures>
-  </release>
-</grit>

chrome/browser/ui/webui/settings/settings_ui.cc

@@ -138,7 +138,7 @@ namespace settings {
 
 #if !BUILDFLAG(OPTIMIZE_WEBUI)
 constexpr char kGeneratedPath[] =
-    "@out_folder@/gen/chrome/browser/resources/settings/";
+    "@out_folder@/gen/chrome/browser/resources/settings/preprocessed/";
 #endif
 
 // static

tools/gritsettings/resource_ids.spec

@@ -191,9 +191,9 @@
   "chrome/browser/resources/settings/settings_resources_vulcanized.grd": {
     "includes": [1820],
   },
-  "chrome/browser/resources/settings/settings_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings/settings_resources.grd": {
+    "META": {"sizes": {"includes": [500],}},
     "includes": [1830],
-    "structures": [1840],
   },
   "chrome/browser/resources/signin/profile_picker/profile_picker_resources_vulcanized.grd": {
     "includes": [1850],