Commit 2af92c98 authored by dpapad's avatar dpapad Committed by Chromium LUCI CQ

WebUI: Auto-generate grd entries for ui/webui/resources/roboto.

Bug: 1132403
Change-Id: I6e8ebf06f0d11d7525fee509c450001f51285b3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2594170
Commit-Queue: John Lee <johntlee@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarJohn Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837810}
parent f7699b85
...@@ -27,6 +27,18 @@ generate_grd("build_grd") { ...@@ -27,6 +27,18 @@ generate_grd("build_grd") {
"$target_gen_dir/js/resources.grdp", "$target_gen_dir/js/resources.grdp",
] ]
if (!is_chromeos && !is_android) {
# Roboto Font. Roboto-Regular and Roboto-Light is already available on
# Android, and Roboto-Medium is not used on Android. All 6 weights of
# Roboto are available on Chrome OS.
input_files_base_dir = rebase_path(".", "//")
input_files = [
"roboto/roboto-bold.woff2",
"roboto/roboto-medium.woff2",
"roboto/roboto-regular.woff2",
]
}
if (include_polymer) { if (include_polymer) {
deps += [ deps += [
"cr_components:build_grdp", "cr_components:build_grdp",
......
...@@ -16,14 +16,6 @@ without changes to the corresponding grd file. --> ...@@ -16,14 +16,6 @@ without changes to the corresponding grd file. -->
<include name="IDR_WEBUI_JS_JSTEMPLATE_COMPILED_JS" <include name="IDR_WEBUI_JS_JSTEMPLATE_COMPILED_JS"
file="../../../third_party/jstemplate/jstemplate_compiled.js" file="../../../third_party/jstemplate/jstemplate_compiled.js"
resource_path="js/jstemplate_compiled.js" type="BINDATA"/> resource_path="js/jstemplate_compiled.js" type="BINDATA"/>
<!-- Roboto Font. Roboto-Regular and Roboto-Light is already available on
Android, and Roboto-Medium is not used on Android. All 6 weights of
Roboto are available on Chrome OS.-->
<if expr="not is_android and not chromeos">
<include name="IDR_WEBUI_ROBOTO_ROBOTO_REGULAR_WOFF2" file="roboto/roboto-regular.woff2" type="BINDATA" />
<include name="IDR_WEBUI_ROBOTO_ROBOTO_MEDIUM_WOFF2" file="roboto/roboto-medium.woff2" type="BINDATA" />
<include name="IDR_WEBUI_ROBOTO_ROBOTO_BOLD_WOFF2" file="roboto/roboto-bold.woff2" type="BINDATA" />
</if>
</includes> </includes>
<structures> <structures>
<structure name="IDR_WEBUI_CSS_MENU_CSS" <structure name="IDR_WEBUI_CSS_MENU_CSS"
......
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