[Build] Make remaining targets compatible with 'enforce_resource_overlays'
This CL: - Sets resource_overlay=true in //weblayer:components_java_strings to indicate that the target duplicates resources in //components/strings:components_locale_settings - Renames android_webview/nonembedded/java/res_devui/drawable/ic_search.xml as the resource conflicts with R.drawable.ic_search BUG=1093825 Change-Id: Ica9c2335fdf688bec594f842e617e82e1a826773 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2389229 Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org> Reviewed-by: Mohamed Heikal <mheikal@chromium.org> Reviewed-by: Bo <boliu@chromium.org> Cr-Commit-Position: refs/heads/master@{#805181} GitOrigin-RevId: 5a3468d7f408eda7fb07f8979ea3b7b22c5ec817
This commit is contained in:
Родитель
a87adab6c8
Коммит
9c1d4223d1
|
@ -1242,6 +1242,7 @@ if (enable_java_templates) {
|
|||
}
|
||||
|
||||
android_generated_resources(target_name) {
|
||||
forward_variables_from(invoker, [ "resource_overlay" ])
|
||||
generating_target_name = ":$_zip_target_name"
|
||||
generated_resources_zip = _resources_zip
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче