Commit 6718d4b5 authored by rbpotter's avatar rbpotter Committed by Chromium LUCI CQ

WebUI: Migrate more users of preprocess_grit to preprocess_if_expr

OS settings, bluetooth_pairing_dialog, nearby_internals, and
profile_picker

Change-Id: Iebddd6ee26b6e88a1b8fa047047ff7fd4a71a72c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2568442
Commit-Queue: dpapad <dpapad@chromium.org>
Auto-Submit: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833261}
parent 8a088a15
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/preprocess_grit.gni") import("//tools/grit/preprocess_if_expr.gni")
import("//tools/polymer/html_to_js.gni") import("//tools/polymer/html_to_js.gni")
import("//ui/webui/resources/tools/generate_grd.gni") import("//ui/webui/resources/tools/generate_grd.gni")
import("../../optimize_webui.gni") import("../../optimize_webui.gni")
...@@ -47,7 +47,7 @@ generate_grd("build_grd") { ...@@ -47,7 +47,7 @@ generate_grd("build_grd") {
out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
} }
preprocess_grit("preprocess_generated") { preprocess_if_expr("preprocess_generated") {
deps = [ ":web_components" ] deps = [ ":web_components" ]
in_folder = target_gen_dir in_folder = target_gen_dir
out_folder = "$target_gen_dir/$preprocess_folder" out_folder = "$target_gen_dir/$preprocess_folder"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/grit_rule.gni") import("//tools/grit/grit_rule.gni")
import("//tools/grit/preprocess_grit.gni") import("//tools/grit/preprocess_if_expr.gni")
import("//tools/polymer/html_to_js.gni") import("//tools/polymer/html_to_js.gni")
import("//ui/webui/resources/tools/generate_grd.gni") import("//ui/webui/resources/tools/generate_grd.gni")
...@@ -29,7 +29,7 @@ generate_grd("build_grd") { ...@@ -29,7 +29,7 @@ generate_grd("build_grd") {
] ]
} }
preprocess_grit("preprocess") { preprocess_if_expr("preprocess") {
in_folder = "./" in_folder = "./"
out_folder = "$target_gen_dir/$preprocess_folder" out_folder = "$target_gen_dir/$preprocess_folder"
out_manifest = "$target_gen_dir/$preprocess_manifest" out_manifest = "$target_gen_dir/$preprocess_manifest"
...@@ -42,7 +42,7 @@ preprocess_grit("preprocess") { ...@@ -42,7 +42,7 @@ preprocess_grit("preprocess") {
] ]
} }
preprocess_grit("preprocess_generated") { preprocess_if_expr("preprocess_generated") {
deps = [ ":web_components" ] deps = [ ":web_components" ]
in_folder = target_gen_dir in_folder = target_gen_dir
out_folder = "$target_gen_dir/$preprocess_folder" out_folder = "$target_gen_dir/$preprocess_folder"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/grit_rule.gni") import("//tools/grit/grit_rule.gni")
import("//tools/grit/preprocess_grit.gni") import("//tools/grit/preprocess_if_expr.gni")
import("//ui/webui/resources/tools/generate_grd.gni") import("//ui/webui/resources/tools/generate_grd.gni")
import("//ui/webui/resources/tools/js_modulizer.gni") import("//ui/webui/resources/tools/js_modulizer.gni")
import("//ui/webui/webui_features.gni") import("//ui/webui/webui_features.gni")
...@@ -122,7 +122,7 @@ if (optimize_webui) { ...@@ -122,7 +122,7 @@ if (optimize_webui) {
# OS Settings specific mojo files, bundled in optimized builds. No need for a # OS Settings specific mojo files, bundled in optimized builds. No need for a
# manifest as the preprocess_mojo_v3 target generates the manifest file for the # manifest as the preprocess_mojo_v3 target generates the manifest file for the
# grd. # grd.
preprocess_grit("preprocess_mojo_v2") { preprocess_if_expr("preprocess_mojo_v2") {
deps = [ deps = [
"//chrome/browser/ui/webui/settings/chromeos/constants:mojom_js", "//chrome/browser/ui/webui/settings/chromeos/constants:mojom_js",
"//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js", "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js",
...@@ -139,7 +139,7 @@ preprocess_grit("preprocess_mojo_v2") { ...@@ -139,7 +139,7 @@ preprocess_grit("preprocess_mojo_v2") {
} }
# OS Settings specific mojo files, bundled in optimized builds. # OS Settings specific mojo files, bundled in optimized builds.
preprocess_grit("preprocess_mojo_v3") { preprocess_if_expr("preprocess_mojo_v3") {
deps = [ deps = [
"//chrome/browser/ui/webui/settings/chromeos/constants:mojom_js", "//chrome/browser/ui/webui/settings/chromeos/constants:mojom_js",
"//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js", "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js",
...@@ -157,7 +157,7 @@ preprocess_grit("preprocess_mojo_v3") { ...@@ -157,7 +157,7 @@ preprocess_grit("preprocess_mojo_v3") {
} }
# Mojo files generated by non-OS-settings targets, not bundled. # Mojo files generated by non-OS-settings targets, not bundled.
preprocess_grit("preprocess_external_mojo") { preprocess_if_expr("preprocess_external_mojo") {
deps = [ deps = [
"//chrome/browser/ui/webui/app_management:mojo_bindings_js", "//chrome/browser/ui/webui/app_management:mojo_bindings_js",
"//components/services/app_service/public/mojom:mojom_js", "//components/services/app_service/public/mojom:mojom_js",
...@@ -266,7 +266,7 @@ generate_grd("build_grd") { ...@@ -266,7 +266,7 @@ generate_grd("build_grd") {
} }
} }
preprocess_grit("preprocess_v3") { preprocess_if_expr("preprocess_v3") {
defines = chrome_grit_defines defines = chrome_grit_defines
in_folder = "../" in_folder = "../"
out_folder = "$target_gen_dir/$preprocess_folder_v3" out_folder = "$target_gen_dir/$preprocess_folder_v3"
...@@ -280,7 +280,7 @@ preprocess_grit("preprocess_v3") { ...@@ -280,7 +280,7 @@ preprocess_grit("preprocess_v3") {
] ]
} }
preprocess_grit("preprocess_gen_v3") { preprocess_if_expr("preprocess_gen_v3") {
defines = chrome_grit_defines defines = chrome_grit_defines
deps = [ ":polymer3_elements" ] deps = [ ":polymer3_elements" ]
in_folder = get_path_info("../", "gen_dir") in_folder = get_path_info("../", "gen_dir")
...@@ -474,7 +474,7 @@ preprocess_grit("preprocess_gen_v3") { ...@@ -474,7 +474,7 @@ preprocess_grit("preprocess_gen_v3") {
] ]
} }
preprocess_grit("preprocess_v2") { preprocess_if_expr("preprocess_v2") {
defines = chrome_grit_defines defines = chrome_grit_defines
in_folder = "../" in_folder = "../"
out_folder = "$target_gen_dir/$preprocess_folder_v2" out_folder = "$target_gen_dir/$preprocess_folder_v2"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/grit_rule.gni") import("//tools/grit/grit_rule.gni")
import("//tools/grit/preprocess_grit.gni") import("//tools/grit/preprocess_if_expr.gni")
import("//tools/polymer/html_to_js.gni") import("//tools/polymer/html_to_js.gni")
import("//ui/webui/resources/tools/generate_grd.gni") import("//ui/webui/resources/tools/generate_grd.gni")
import("../../optimize_webui.gni") import("../../optimize_webui.gni")
...@@ -77,7 +77,7 @@ generate_grd("build_grd") { ...@@ -77,7 +77,7 @@ generate_grd("build_grd") {
} }
} }
preprocess_grit("preprocess") { preprocess_if_expr("preprocess") {
in_folder = "./" in_folder = "./"
out_folder = "$target_gen_dir/$preprocess_folder" out_folder = "$target_gen_dir/$preprocess_folder"
out_manifest = "$target_gen_dir/$preprocess_manifest" out_manifest = "$target_gen_dir/$preprocess_manifest"
...@@ -92,7 +92,7 @@ preprocess_grit("preprocess") { ...@@ -92,7 +92,7 @@ preprocess_grit("preprocess") {
] ]
} }
preprocess_grit("preprocess_generated") { preprocess_if_expr("preprocess_generated") {
deps = [ ":web_components" ] deps = [ ":web_components" ]
in_folder = target_gen_dir in_folder = target_gen_dir
out_folder = "$target_gen_dir/$preprocess_folder" out_folder = "$target_gen_dir/$preprocess_folder"
......
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