Merge Android Pie into master
Bug: 112104996
Change-Id: Ibdc0b8895ce921d60ddefac422e445f1ca76cbc2
diff --git a/README b/README
index 788ff11..19e5378 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@
------
The prebuilt libwebviewchromium.so included in these APKs is built from Chromium
-release tag 58.0.3029.125, using the GN build tool. To match our build settings, set:
+release tag 61.0.3163.98, using the GN build tool. To match our build settings, set:
target_os="android"
is_debug=false
@@ -24,9 +24,9 @@
------
-Due to WebView API changes in the O release, the Java code in the Chromium
-3029_108 branch is not compatible with O. We'll be working on upstreaming
-the O-specific Java changes to Chromium once the final O SDK is released.
+Due to WebView API changes in the O-MR1 release, the Java code in the Chromium
+3163 branch is not compatible with O-MR1. We'll be working on upstreaming
+the O-MR1 specific Java changes to Chromium once the final O-MR1 SDK is released.
------
diff --git a/prebuilt/arm/webview.apk b/prebuilt/arm/webview.apk
index 5ca3d81..b359144 100644
--- a/prebuilt/arm/webview.apk
+++ b/prebuilt/arm/webview.apk
Binary files differ
diff --git a/prebuilt/arm64/webview.apk b/prebuilt/arm64/webview.apk
index 2ad57a3..2f85d3b 100644
--- a/prebuilt/arm64/webview.apk
+++ b/prebuilt/arm64/webview.apk
Binary files differ
diff --git a/prebuilt/x86/webview.apk b/prebuilt/x86/webview.apk
index 79e07e1..387d767 100644
--- a/prebuilt/x86/webview.apk
+++ b/prebuilt/x86/webview.apk
Binary files differ
diff --git a/prebuilt/x86_64/webview.apk b/prebuilt/x86_64/webview.apk
index 0c22389..bc95241 100644
--- a/prebuilt/x86_64/webview.apk
+++ b/prebuilt/x86_64/webview.apk
Binary files differ
