From 5a3468d7f408eda7fb07f8979ea3b7b22c5ec817 Mon Sep 17 00:00:00 2001 From: Peter Kotwicz Date: Wed, 9 Sep 2020 01:59:59 +0000 Subject: [PATCH] [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 Reviewed-by: Mohamed Heikal Reviewed-by: Bo Cr-Commit-Position: refs/heads/master@{#805181} --- android_webview/nonembedded/BUILD.gn | 2 +- .../res_devui/drawable/{ic_search.xml => ic_devui_search.xml} | 0 .../nonembedded/java/res_devui/layout/fragment_flags.xml | 2 +- build/config/android/rules.gni | 1 + weblayer/BUILD.gn | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) rename android_webview/nonembedded/java/res_devui/drawable/{ic_search.xml => ic_devui_search.xml} (100%) diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn index 93c90c2182f1f4..a7835b26eec056 100644 --- a/android_webview/nonembedded/BUILD.gn +++ b/android_webview/nonembedded/BUILD.gn @@ -138,8 +138,8 @@ android_resources("devui_resources") { "java/res_devui/drawable/ic_alert_error.xml", "java/res_devui/drawable/ic_clear_text.xml", "java/res_devui/drawable/ic_delete.xml", + "java/res_devui/drawable/ic_devui_search.xml", "java/res_devui/drawable/ic_flag.xml", - "java/res_devui/drawable/ic_search.xml", "java/res_devui/layout/activity_main.xml", "java/res_devui/layout/crashes_list_item_body.xml", "java/res_devui/layout/crashes_list_item_header.xml", diff --git a/android_webview/nonembedded/java/res_devui/drawable/ic_search.xml b/android_webview/nonembedded/java/res_devui/drawable/ic_devui_search.xml similarity index 100% rename from android_webview/nonembedded/java/res_devui/drawable/ic_search.xml rename to android_webview/nonembedded/java/res_devui/drawable/ic_devui_search.xml diff --git a/android_webview/nonembedded/java/res_devui/layout/fragment_flags.xml b/android_webview/nonembedded/java/res_devui/layout/fragment_flags.xml index ec3d537880ae48..c1c9c2b7f1838e 100644 --- a/android_webview/nonembedded/java/res_devui/layout/fragment_flags.xml +++ b/android_webview/nonembedded/java/res_devui/layout/fragment_flags.xml @@ -32,7 +32,7 @@ android:inputType="textFilter" android:singleLine="true" android:drawablePadding="4dp" - android:drawableStart="@drawable/ic_search" + android:drawableStart="@drawable/ic_devui_search" android:imeOptions="actionDone|actionSearch" android:textAppearance="?android:attr/textAppearanceMedium"/> diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index fbcec6f9ca2847..8bf6bca84173e4 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -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 } diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn index 6734dac1f2f2c0..4910e551ce4a3b 100644 --- a/weblayer/BUILD.gn +++ b/weblayer/BUILD.gn @@ -114,6 +114,7 @@ if (is_android) { } java_strings_grd_prebuilt("components_java_strings") { + resource_overlay = true grit_output_dir = "$root_gen_dir/weblayer/java/res" generated_files = rebase_path(weblayer_components_strings_java_resources, "java/res", ".")