summaryrefslogtreecommitdiffstats
path: root/chromium/android_webview/variables.gni
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-03-11 11:32:04 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-03-18 13:40:17 +0000
commit31ccca0778db85c159634478b4ec7997f6704860 (patch)
tree3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/android_webview/variables.gni
parent248b70b82a40964d5594eb04feca0fa36716185d (diff)
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/android_webview/variables.gni')
-rw-r--r--chromium/android_webview/variables.gni10
1 files changed, 8 insertions, 2 deletions
diff --git a/chromium/android_webview/variables.gni b/chromium/android_webview/variables.gni
index c2da2dd8db8..299b2092e01 100644
--- a/chromium/android_webview/variables.gni
+++ b/chromium/android_webview/variables.gni
@@ -4,14 +4,20 @@
import("//weblayer/variables.gni")
+declare_args() {
+ # Show a launcher icon to open WebView developer UI, off by default.
+ webview_devui_show_icon = false
+}
+
system_webview_android_manifest =
"$root_gen_dir/android_webview/system_webview_apk/AndroidManifest.xml"
trichrome_webview_android_manifest =
"$root_gen_dir/android_webview/trichrome_webview_apk/AndroidManifest.xml"
+trichrome_webview_64_32_android_manifest = "$root_gen_dir/android_webview/trichrome_webview_64_32_apk/AndroidManifest.xml"
upstream_only_webview_deps = [
"//android_webview:platform_service_bridge_upstream_implementation_java",
- "//android_webview:system_webview_resources",
+ "//android_webview/nonembedded:icon_resources",
]
if (webview_includes_weblayer) {
@@ -19,4 +25,4 @@ if (webview_includes_weblayer) {
[ "//weblayer/browser/java:gms_bridge_upstream_impl_java" ]
}
-webview_locale_config_java_package = "org.chromium.android_webview"
+webview_product_config_java_package = "org.chromium.android_webview"