Commit 8bfd8243 authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot

Move all resources to base module when chrome is in isolated split

There are various bugs with resources in isolated splits including:
- RemoteViews can't access them
- Splash screens for activities with themes defined in the isolated
  split fail
- Bugs like crbug.com/1133898 (not strictly isolated split related
  though, but this fixes it for the chrome split)
- Possibly more...

For now I think it makes sense to move all resources to the base module
to avoid these and any not yet uncovered bugs. Later we can see if it
makes sense to move these back into the chrome split.

Bug: 1126301
Change-Id: Id4b3d20b8d88dcea9b7ba2d090c07714324cee1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2463642Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815658}
parent ac9ed27a
......@@ -534,6 +534,7 @@ template("monochrome_public_common_apk_or_module_tmpl") {
} else {
deps += [ "//chrome/android:base_module_java" ]
}
deps += [ ":${target_name}__all_chrome_resources" ]
deps += _chrome_module_shared_lib_deps
_loadable_modules_32_bit = []
_loadable_modules_64_bit = []
......
......@@ -41,6 +41,7 @@ template("chrome_bundle") {
# - All //chrome-specific manifest definitions (e.g. activities, services)
# will be moved to the chrome DFM AndroidManifest.xml.
if (_enable_chrome_module) {
_base_target_name = get_label_info(invoker.base_module_target, "name")
_base_target_gen_dir =
get_label_info(invoker.base_module_target, "target_gen_dir")
_base_name = get_label_info(invoker.base_module_target, "name")
......@@ -91,6 +92,13 @@ template("chrome_bundle") {
load_native_on_get_impl = false
}
_module_descs += [ chrome_module_desc ]
# TODO(crbug.com/1126301): Isolated splits cause various bugs with resource
# access. For now, move all resources to the base module.
android_resources("${_base_target_name}__all_chrome_resources") {
recursive_resource_deps = true
deps = chrome_module_desc.java_deps
}
} else {
_module_descs = invoker.module_descs
}
......
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