Skip to content

GitLab

T
tangled
Commit 28dff9b7 authored by dpapad's avatar dpapad Committed by Commit Bot
Browse files
Options

Settings: Autogenerate grd for non-optimized builds 

Bug: 1132403
Change-Id: I8a7d2c9c9fb54cbb7394d89afa7e91398a3ce1d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2460710Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815518}
parent 2a78b2a0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 279 additions and 1170 deletions
chrome/browser/resources/BUILD.gn
View file @ 28dff9b7
...@@ -276,16 +276,20 @@ if (!is_android) { ...@@ -276,16 +276,20 @@ if (!is_android) {
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
] ]
defines = chrome_grit_defines
if (optimize_webui) { if (optimize_webui) {
source = "settings/settings_resources_vulcanized.grd" source = "settings/settings_resources_vulcanized.grd"
deps = [ "//chrome/browser/resources/settings:build_polymer3" ] deps = [ "//chrome/browser/resources/settings:build_polymer3" ]
} else { } else {
source = "settings/settings_resources.grd" # These arguments are needed since the grd is generated at build time.
deps = [ "//chrome/browser/resources/settings:polymer3_elements" ] 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 = [ outputs = [
"grit/settings_resources.h", "grit/settings_resources.h",
"grit/settings_resources_map.cc", "grit/settings_resources_map.cc",
......
chrome/browser/resources/settings/BUILD.gn
View file @ 28dff9b7
...@@ -7,14 +7,17 @@ import("//third_party/closure_compiler/compile_js.gni") ...@@ -7,14 +7,17 @@ import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/preprocess_grit.gni") import("//tools/grit/preprocess_grit.gni")
import("//tools/polymer/html_to_js.gni") import("//tools/polymer/html_to_js.gni")
import("//tools/polymer/polymer.gni") import("//tools/polymer/polymer.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")
import("../optimize_webui.gni") import("../optimize_webui.gni")
import("settings.gni") import("settings.gni")
if (optimize_webui) { preprocess_folder = "preprocessed"
preprocess_folder = "preprocessed" preprocess_manifest = "preprocessed_manifest.json"
preprocess_gen_manifest = "preprocessed_gen_manifest.json"
if (optimize_webui) {
optimize_webui("build_polymer3") { optimize_webui("build_polymer3") {
host = "settings" host = "settings"
input = rebase_path("$target_gen_dir/$preprocess_folder", root_build_dir) input = rebase_path("$target_gen_dir/$preprocess_folder", root_build_dir)
...@@ -39,10 +42,25 @@ if (optimize_webui) { ...@@ -39,10 +42,25 @@ if (optimize_webui) {
"chrome://resources/mojo/skia/public/mojom/skcolor.mojom-lite.js", "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-lite.js",
] ]
} }
} else {
generate_grd("build_grd") {
deps = [
":preprocess",
":preprocess_generated",
]
manifest_files = [
"$target_gen_dir/$preprocess_manifest",
"$target_gen_dir/$preprocess_gen_manifest",
]
grd_prefix = "settings"
out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
}
}
preprocess_grit("preprocess") { preprocess_grit("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"
in_files = [ in_files = [
"a11y_page/captions_browser_proxy.js", "a11y_page/captions_browser_proxy.js",
"appearance_page/appearance_browser_proxy.js", "appearance_page/appearance_browser_proxy.js",
...@@ -72,15 +90,31 @@ if (optimize_webui) { ...@@ -72,15 +90,31 @@ if (optimize_webui) {
"reset_page/reset_browser_proxy.js", "reset_page/reset_browser_proxy.js",
"route.js", "route.js",
"safety_check_page/safety_check_browser_proxy.js", "safety_check_page/safety_check_browser_proxy.js",
"settings.js",
"settings_page/main_page_behavior.js", "settings_page/main_page_behavior.js",
"settings_routes.js", "settings_routes.js",
"settings.js",
"site_settings/constants.js", "site_settings/constants.js",
"site_settings/cookie_info.js", "site_settings/cookie_info.js",
"site_settings/local_data_browser_proxy.js", "site_settings/local_data_browser_proxy.js",
"site_settings/site_settings_behavior.js", "site_settings/site_settings_behavior.js",
"site_settings/site_settings_prefs_browser_proxy.js", "site_settings/site_settings_prefs_browser_proxy.js",
"site_settings/website_usage_browser_proxy.js", "site_settings/website_usage_browser_proxy.js",
# TODO(dpapad): Pass these directly to the generate_grd() target above, once
# support for that is added, as part of crbug.com/1132403.
"images/cookies_banner.svg",
"images/cookies_banner_dark.svg",
"images/password_check_neutral.svg",
"images/password_check_neutral_dark.svg",
"images/password_check_positive.svg",
"images/password_check_positive_dark.svg",
"images/permissions_banner.svg",
"images/permissions_banner_dark.svg",
"images/safe_browsing_banner.svg",
"images/safe_browsing_banner_dark.svg",
"images/sync_banner.svg",
"images/sync_banner_dark.svg",
"settings_v3.html",
] ]
if (is_chromeos) { if (is_chromeos) {
...@@ -98,12 +132,13 @@ if (optimize_webui) { ...@@ -98,12 +132,13 @@ if (optimize_webui) {
"system_page/system_page_browser_proxy.js", "system_page/system_page_browser_proxy.js",
] ]
} }
} }
preprocess_grit("preprocess_generated") { preprocess_grit("preprocess_generated") {
deps = [ ":polymer3_elements" ] deps = [ ":polymer3_elements" ]
in_folder = target_gen_dir in_folder = target_gen_dir
out_folder = "$target_gen_dir/$preprocess_folder" out_folder = "$target_gen_dir/$preprocess_folder"
out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
in_files = [ in_files = [
"a11y_page/a11y_page.js", "a11y_page/a11y_page.js",
"a11y_page/captions_subpage.m.js", "a11y_page/captions_subpage.m.js",
...@@ -277,7 +312,6 @@ if (optimize_webui) { ...@@ -277,7 +312,6 @@ if (optimize_webui) {
"system_page/system_page.js", "system_page/system_page.js",
] ]
} }
}
} }
group("closure_compile") { group("closure_compile") {
......
chrome/browser/resources/settings/settings_resources.grd deleted 100644 → 0
View file @ 2a78b2a0
<?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
View file @ 28dff9b7
...@@ -138,7 +138,7 @@ namespace settings { ...@@ -138,7 +138,7 @@ namespace settings {
#if !BUILDFLAG(OPTIMIZE_WEBUI) #if !BUILDFLAG(OPTIMIZE_WEBUI)
constexpr char kGeneratedPath[] = constexpr char kGeneratedPath[] =
"@out_folder@/gen/chrome/browser/resources/settings/"; "@out_folder@/gen/chrome/browser/resources/settings/preprocessed/";
#endif #endif
// static // static
......
tools/gritsettings/resource_ids.spec
View file @ 28dff9b7
...@@ -191,9 +191,9 @@ ...@@ -191,9 +191,9 @@
"chrome/browser/resources/settings/settings_resources_vulcanized.grd": { "chrome/browser/resources/settings/settings_resources_vulcanized.grd": {
"includes": [1820], "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], "includes": [1830],
"structures": [1840],
}, },
"chrome/browser/resources/signin/profile_picker/profile_picker_resources_vulcanized.grd": { "chrome/browser/resources/signin/profile_picker/profile_picker_resources_vulcanized.grd": {
"includes": [1850], "includes": [1850],
......
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