Commit 48772354 authored by Christopher Lam's avatar Christopher Lam Committed by Commit Bot

Fix App Management mojom build dependency.

This CL is a speculative fix for flakes in OS Settings browser tests
that were being caused by mojo-lite files erroring at runtime.

The theorized mechanism of failure is that the build dependencies
were not set up correctly, and the os_settings_resources target picked
up an old version of the mojo-lite file before the
chrome/browser:resources target had a chance to run.

Bug: 1057389
Change-Id: Ib296133a4f90300b027c28205278fe79b3e55527
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2094913
Commit-Queue: calamity <calamity@chromium.org>
Reviewed-by: default avatarGiovanni Ortuño Urquidi <ortuno@chromium.org>
Reviewed-by: default avatarNicholas Verne <nverne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749532}
parent 1f8a942d
...@@ -5605,10 +5605,7 @@ grit("resources") { ...@@ -5605,10 +5605,7 @@ grit("resources") {
if (is_android) { if (is_android) {
deps += deps +=
[ "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings_js" ] [ "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings_js" ]
} else {
deps += [ "//chrome/browser/ui/webui/app_management:mojo_bindings_js" ]
} }
if (is_chromeos) { if (is_chromeos) {
deps += [ deps += [
"//chrome/browser/resources/chromeos/crostini_installer:polymer3_elements", "//chrome/browser/resources/chromeos/crostini_installer:polymer3_elements",
...@@ -5618,6 +5615,7 @@ grit("resources") { ...@@ -5618,6 +5615,7 @@ grit("resources") {
"//chrome/browser/resources/chromeos/set_time_dialog:polymer3_elements", "//chrome/browser/resources/chromeos/set_time_dialog:polymer3_elements",
"//chrome/browser/resources/chromeos/smb_shares:polymer3_elements", "//chrome/browser/resources/chromeos/smb_shares:polymer3_elements",
"//chrome/browser/supervised_user:supervised_user_unscaled_resources", "//chrome/browser/supervised_user:supervised_user_unscaled_resources",
"//chrome/browser/ui/webui/app_management:mojo_bindings_js",
"//chrome/browser/ui/webui/chromeos/add_supervision:mojo_bindings_js", "//chrome/browser/ui/webui/chromeos/add_supervision:mojo_bindings_js",
"//chrome/browser/ui/webui/chromeos/crostini_installer:mojo_bindings_js", "//chrome/browser/ui/webui/chromeos/crostini_installer:mojo_bindings_js",
"//chrome/browser/ui/webui/chromeos/crostini_upgrader:mojo_bindings_js", "//chrome/browser/ui/webui/chromeos/crostini_upgrader:mojo_bindings_js",
......
...@@ -292,13 +292,14 @@ if (!is_android) { ...@@ -292,13 +292,14 @@ if (!is_android) {
if (is_chromeos) { if (is_chromeos) {
grit("os_settings_resources") { grit("os_settings_resources") {
deps = [ "//chrome/browser/ui/webui/app_management:mojo_bindings_js" ]
if (optimize_webui) { if (optimize_webui) {
source = "settings/os_settings_resources_vulcanized.grd" source = "settings/os_settings_resources_vulcanized.grd"
# The .grd contains references to generated files. # The .grd contains references to generated files.
source_is_generated = true source_is_generated = true
deps = [ "//chrome/browser/resources/settings/chromeos:build" ] deps += [ "//chrome/browser/resources/settings/chromeos:build" ]
grit_flags = [ grit_flags = [
"-E", "-E",
......
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