Update bottom sheet in apk template

brave · Jul 22, 2020 · d4e5b00 · d4e5b00
1 parent e70d9ac
commit d4e5b00
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/build/android/config.gni b/build/android/config.gni
@@ -34,3 +34,7 @@ brave_chrome_app_java_resources_deps = [
 brave_components_browser_ui_site_settings_android_java_resources_deps = [
   "//brave/build/android:android_brave_strings_grd",
 ]
+
+brave_resources_exclusion_exceptions = [
+"*com_google_android_material_material*design_bottom_*"
+]
diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch
@@ -1,8 +1,16 @@
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
-index 4438f47bcfdb8cbbc1428b35d22bff3aa3f484c4..fdbfe3793dc5e7f9f114be0520d21796dda9beba 100644
+index 4438f47bcfdb8cbbc1428b35d22bff3aa3f484c4..ed160c6ca53f4a68690dc694426e33562876065a 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -299,6 +299,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
+@@ -195,6 +195,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
+       "${_material_package}/text_*",
+     ]
+     resource_values_filter_rules = [ "${_material_package}:mtrl_alert" ]
++    resource_exclusion_exceptions += brave_resources_exclusion_exceptions
+
+     if (!_is_monochrome) {
+       product_config_java_packages = [ "org.chromium.chrome.browser" ]
+@@ -299,6 +300,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
        if (!defined(proguard_configs)) {
          proguard_configs = []
        }