Commit c52590f2 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Fix duplicate BuildConfig.class in TrichromeLibrary

It conflicts with TrichromeWebview's BuildConfig class. Fixes locale pak
issues when running with is_java_debug=false

Change-Id: I75a53119b1148c1c264554bbe5df49f912cb342f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1613361
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659959}
parent 07bd6b9e
......@@ -64,7 +64,12 @@ template("trichrome_library_apk_tmpl") {
version_name = chrome_version_name
version_code = trichrome_version_code
min_sdk_version = 28
product_version_resources_dep = "//chrome/android:product_version_resources"
if (!enable_trichrome_synchronized_proguard) {
generate_buildconfig_java = false
} else {
product_version_resources_dep =
"//chrome/android:product_version_resources"
}
# TODO(torne): using system_webview_resources just to get a temporary icon
deps = [
......
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