Commit 31798270 authored by Demetrios Papadopoulos's avatar Demetrios Papadopoulos Committed by Commit Bot

Settings: Add settings_resources_v3.grdp.

This is in preparation of migrating to Polymer 3.

Bug: 1026426
Change-Id: Ia950fecef1b3a13af65d5e1505d2cd37d1e1b5cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2024150Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735702}
parent d1d0f246
...@@ -202,6 +202,11 @@ if (!is_android) { ...@@ -202,6 +202,11 @@ if (!is_android) {
} }
grit("settings_resources") { grit("settings_resources") {
grit_flags = [
"-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
]
if (optimize_webui) { if (optimize_webui) {
source = "settings/settings_resources_vulcanized.grd" source = "settings/settings_resources_vulcanized.grd"
...@@ -209,10 +214,6 @@ if (!is_android) { ...@@ -209,10 +214,6 @@ if (!is_android) {
source_is_generated = true source_is_generated = true
deps = [ "//chrome/browser/resources/settings:build" ] deps = [ "//chrome/browser/resources/settings:build" ]
grit_flags = [
"-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
]
} else { } else {
source = "settings/settings_resources.grd" source = "settings/settings_resources.grd"
} }
......
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
<output filename="settings_resources.pak" type="data_package" /> <output filename="settings_resources.pak" type="data_package" />
</outputs> </outputs>
<release seq="1"> <release seq="1">
<includes>
<part file="settings_resources_v3.grdp" />
</includes>
<structures> <structures>
<structure name="IDR_SETTINGS_A11Y_PAGE_JS" <structure name="IDR_SETTINGS_A11Y_PAGE_JS"
file="a11y_page/a11y_page.js" file="a11y_page/a11y_page.js"
......
<?xml version="1.0" encoding="utf-8"?>
<grit-part>
<!--TODO(crbug.com/1026426): Add generated Polymer 3 files here-->
</grit-part>
...@@ -174,6 +174,7 @@ ...@@ -174,6 +174,7 @@
"includes": [1780], "includes": [1780],
}, },
"chrome/browser/resources/settings/settings_resources.grd": { "chrome/browser/resources/settings/settings_resources.grd": {
"includes": [1790],
"structures": [1800], "structures": [1800],
}, },
"chrome/browser/resources/tab_strip/tab_strip_resources.grd": { "chrome/browser/resources/tab_strip/tab_strip_resources.grd": {
......
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