Commit 228cda97 authored by Robbie McElrath's avatar Robbie McElrath Committed by Commit Bot

[AW] Add missing //aw/apk dependency to webview libraries

This was accidentally removed in crrev.com/c/1880070, and causes a
crash when launching the license activity. I tested the aforementioned
CL by selecting "System WebView licenses" in the Settings UI, but it
turns out that launches the first android.settings.WEBVIEW_LICENSE
activity it finds in the system image, so it wasn't actually testing my
change.

This also removes an about_ui_android dependency from
//aw:libwebviewchromium since that's already in //aw:apk where it
belongs.

Test: adb shell am start -n com.google.android.apps.chrome/org.chromium.android_webview.app.LicenseActivity
Bug: 934152
Change-Id: I8115d6bd5291249da0b6c625c5f210b0d953c62b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904615
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714609}
parent c62b5ff5
...@@ -408,8 +408,8 @@ grit("generate_components_strings") { ...@@ -408,8 +408,8 @@ grit("generate_components_strings") {
shared_library("libwebviewchromium") { shared_library("libwebviewchromium") {
deps = [ deps = [
"//android_webview/apk",
"//android_webview/lib:webview_entry_point", "//android_webview/lib:webview_entry_point",
"//components/about_ui:about_ui_android",
] ]
configs -= [ "//build/config/android:hide_all_but_jni_onload" ] configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
configs += [ "//build/config/android:hide_all_but_jni" ] configs += [ "//build/config/android:hide_all_but_jni" ]
...@@ -441,6 +441,7 @@ template("webview_library") { ...@@ -441,6 +441,7 @@ template("webview_library") {
chrome_common_shared_library(target_name) { chrome_common_shared_library(target_name) {
forward_variables_from(invoker, "*") forward_variables_from(invoker, "*")
deps = [ deps = [
"//android_webview/apk",
"//android_webview/lib:webview_entry_point", "//android_webview/lib:webview_entry_point",
] ]
is_webview = true is_webview = true
......
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