Commit 5a3468d7 authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot

[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: default avatarMohamed Heikal <mheikal@chromium.org>
Reviewed-by: default avatarBo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805181}
parent a817d93a
......@@ -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",
......
......@@ -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"/>
......
......@@ -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
}
......
......@@ -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", ".")
......
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