Commit 3cd99aa2 authored by Mohamed Heikal's avatar Mohamed Heikal Committed by Commit Bot

[Android] Fix material design package in resource exclusion regexes

Downstream material design targets are named slightly differently than
upstream material design. Remove the final "_material" from the regex in
order to also match downstream package names.

TBR=just bringing weblayer exclusions in line with chrome's

Bug: 1110346
Change-Id: If4588d674db9ef466fb95e4bf2022eed380908b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380087
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802449}
parent 2114033b
......@@ -168,7 +168,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
# are currently duplicated in system_webview_apk_tmpl.gni.
# Used only by alert dialog on tiny screens.
_material_package = "com_google_android_material_material.*"
_material_package = "com_google_android_material.*"
resource_exclusion_regex += "|${_material_package}values-small"
# Used only by date picker (which chrome doesn't use).
......@@ -182,7 +182,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
resource_exclusion_regex +=
"|${_material_package}/drawable.*design_snackbar"
resource_exclusion_regex += "|${_material_package}/xml.*badge_"
_material_package = "*com_google_android_material_material*"
_material_package = "*com_google_android_material*"
resource_exclusion_exceptions += [
# AppBarLayout
"${_material_package}design_appbar_*",
......
......@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
_material_package = "*com_google_android_material_material*"
_material_package = "*com_google_android_material*"
weblayer_resource_exclusion_exceptions = [
# TextInputLayout (used for HTTP Auth dialog)
......@@ -37,7 +37,7 @@ weblayer_resource_values_filter_rules = [
"${_material_package}:[Tt]oolbarLayout",
]
_material_package = "com_google_android_material_material.*"
_material_package = "com_google_android_material.*"
# Used only by alert dialog on tiny screens.
weblayer_resource_exclusion_regex = "${_material_package}values-small"
......
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