Nearby Internals: autogenerate grd file

Bug: 1132403
Change-Id: Ic0f6da7e726d727a323baa194221107646bd9a79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2530898
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826666}

chrome/BUILD.gn

@@ -1379,10 +1379,10 @@ group("extra_resources") {
     public_deps += [
       "//chrome/browser/resources:bluetooth_pairing_dialog_resources",
       "//chrome/browser/resources:multidevice_internals_resources",
-      "//chrome/browser/resources:nearby_internals_resources",
       "//chrome/browser/resources/chromeos:cellular_setup_resources",
       "//chrome/browser/resources/chromeos:multidevice_setup_resources",
       "//chrome/browser/resources/chromeos/accessibility:build",
+      "//chrome/browser/resources/nearby_internals:nearby_internals_resources",
       "//chrome/browser/resources/nearby_share:nearby_share_dialog_resources",
       "//chrome/browser/resources/settings/chromeos:os_settings_resources",
       "//third_party/ink:ink_resources",

chrome/browser/resources/BUILD.gn

@@ -215,21 +215,6 @@ if (is_chromeos) {
     output_dir = "$root_gen_dir/chrome"
   }
 
-  grit("nearby_internals_resources") {
-    source = "nearby_internals/nearby_internals_resources.grd"
-
-    deps = [ "//chrome/browser/resources/nearby_internals:web_components" ]
-
-    defines = chrome_grit_defines
-    outputs = [
-      "grit/nearby_internals_resources.h",
-      "grit/nearby_internals_resources_map.cc",
-      "grit/nearby_internals_resources_map.h",
-      "nearby_internals_resources.pak",
-    ]
-    output_dir = "$root_gen_dir/chrome"
-  }
-
   grit("bluetooth_pairing_dialog_resources") {
     defines = chrome_grit_defines
 

chrome/browser/resources/nearby_internals/BUILD.gn

@@ -2,8 +2,81 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/grit/grit_rule.gni")
+import("//tools/grit/preprocess_grit.gni")
 import("//tools/polymer/html_to_js.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
+
+preprocess_folder = "preprocessed"
+preprocess_manifest = "preprocessed_manifest.json"
+preprocess_gen_manifest = "preprocessed_gen_manifest.json"
+
+generate_grd("build_grd") {
+  grd_prefix = "nearby_internals"
+  out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
+  input_files = [ "index.html" ]
+  input_files_base_dir = rebase_path(".", "//")
+
+  deps = [
+    ":preprocess",
+    ":preprocess_generated",
+  ]
+  manifest_files = [
+    "$target_gen_dir/$preprocess_manifest",
+    "$target_gen_dir/$preprocess_gen_manifest",
+  ]
+}
+
+preprocess_grit("preprocess") {
+  in_folder = "./"
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_manifest"
+  in_files = [
+    "nearby_contact_browser_proxy.js",
+    "nearby_http_browser_proxy.js",
+    "nearby_logs_browser_proxy.js",
+    "nearby_ui_trigger_browser_proxy.js",
+    "types.js",
+  ]
+}
+
+preprocess_grit("preprocess_generated") {
+  deps = [ ":web_components" ]
+  in_folder = target_gen_dir
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
+  in_files = [
+    "contact_object.js",
+    "contact_tab.js",
+    "http_message_object.js",
+    "http_tab.js",
+    "log_object.js",
+    "logging_tab.js",
+    "nearby_internals.js",
+    "shared_style.js",
+    "ui_trigger_list_object.js",
+    "ui_trigger_tab.js",
+  ]
+}
+
+grit("nearby_internals_resources") {
+  defines = chrome_grit_defines
+
+  # These arguments are needed since the grd is generated at build time.
+  enable_input_discovery_for_gn_analyze = false
+  source = "$target_gen_dir/nearby_internals_resources.grd"
+  deps = [ ":build_grd" ]
+
+  outputs = [
+    "grit/nearby_internals_resources.h",
+    "grit/nearby_internals_resources_map.cc",
+    "grit/nearby_internals_resources_map.h",
+    "nearby_internals_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chrome"
+}
 
 js_type_check("closure_compile") {
   is_polymer3 = true

chrome/browser/resources/nearby_internals/nearby_internals_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/nearby_internals_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="grit/nearby_internals_resources_map.cc"
-            type="resource_file_map_source" />
-    <output filename="grit/nearby_internals_resources_map.h"
-            type="resource_map_header" />
-    <output filename="nearby_internals_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-   <includes>
-      <include name="IDR_NEARBY_INTERNALS_TYPES_JS"
-               file="types.js"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_HTTP_MESSAGE_OBJECT_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\http_message_object.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_HTTP_TAB_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\http_tab.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_INDEX_HTML"
-               file="index.html"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_LOG_OBJECT_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\log_object.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_LOGGING_TAB_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\logging_tab.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_UI_TRIGGER_TAB_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\ui_trigger_tab.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_NEARBY_INTERNALS_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\nearby_internals.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_NEARBY_HTTP_BROWSER_PROXY_JS"
-               file="nearby_http_browser_proxy.js"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_NEARBY_LOGS_BROWSER_PROXY_JS"
-               file="nearby_logs_browser_proxy.js"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_NEARBY_UI_TRIGGER_BROWSER_PROXY_JS"
-               file="nearby_ui_trigger_browser_proxy.js"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_SHARED_STYLE_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\shared_style.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_CONTACT_OBJECT_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\contact_object.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_CONTACT_TAB_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\contact_tab.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-       <include name="IDR_NEARBY_INTERNALS_NEARBY_CONTACT_BROWSER_PROXY_JS"
-               file="nearby_contact_browser_proxy.js"
-               type="BINDATA"/>
-      <include name="IDR_NEARBY_INTERNALS_UI_TRIGGER_LIST_OBJECT_JS"
-               file="${root_gen_dir}\chrome\browser\resources\nearby_internals\ui_trigger_list_object.js"
-               use_base_dir="false"
-               type="BINDATA"/>
-    </includes>
-  </release>
-</grit>

chrome/browser/ui/webui/nearby_internals/nearby_internals_ui.cc

@@ -24,11 +24,6 @@
 #include "content/public/browser/web_ui_data_source.h"
 #include "ui/base/webui/web_ui_util.h"
 
-namespace {
-constexpr char kNearbyInternalsGeneratedPath[] =
-    "@out_folder@/gen/chrome/browser/resources/nearby_internals/";
-}  // namespace
-
 NearbyInternalsUI::NearbyInternalsUI(content::WebUI* web_ui)
     : ui::MojoWebUIController(web_ui, /*enable_chrome_send=*/true) {
   Profile* profile = Profile::FromWebUI(web_ui);
@@ -42,7 +37,7 @@ NearbyInternalsUI::NearbyInternalsUI(content::WebUI* web_ui)
   webui::SetupWebUIDataSource(
       html_source,
       base::make_span(kNearbyInternalsResources, kNearbyInternalsResourcesSize),
-      kNearbyInternalsGeneratedPath, IDR_NEARBY_INTERNALS_INDEX_HTML);
+      /*generated_path=*/std::string(), IDR_NEARBY_INTERNALS_INDEX_HTML);
 
   content::WebUIDataSource::Add(profile, html_source);
   content::BrowserContext* context =

chrome/chrome_paks.gni

@@ -199,9 +199,9 @@ template("chrome_extra_paks") {
         "//ash/public/cpp/resources:ash_public_unscaled_resources",
         "//chrome/browser/resources:bluetooth_pairing_dialog_resources",
         "//chrome/browser/resources:multidevice_internals_resources",
-        "//chrome/browser/resources:nearby_internals_resources",
         "//chrome/browser/resources/chromeos:cellular_setup_resources",
         "//chrome/browser/resources/chromeos:multidevice_setup_resources",
+        "//chrome/browser/resources/nearby_internals:nearby_internals_resources",
         "//chrome/browser/resources/nearby_share:nearby_share_dialog_resources",
         "//chrome/browser/resources/settings/chromeos:os_settings_resources",
         "//chrome/browser/supervised_user:supervised_user_unscaled_resources",

tools/gritsettings/resource_ids.spec

@@ -143,7 +143,8 @@
   "chrome/browser/resources/local_ntp/local_ntp_resources.grd": {
     "includes": [1620],
   },
-  "chrome/browser/resources/nearby_internals/nearby_internals_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/nearby_internals/nearby_internals_resources.grd": {
+    "META": {"sizes": {"includes": [20]}},
     "includes": [1630],
   },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/nearby_share/nearby_share_dialog_resources.grd": {