aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-06-08 11:06:59 -0700
committerXin Li <delphij@google.com>2018-06-08 11:06:59 -0700
commitda121a9cb690c44bf05448073692cf0cd9c6eb63 (patch)
tree7ef2783cc1c7ceb2904e517216ecf3ad05ec7527
parent7519bf067495807fbd43f984bf5370f6765aa528 (diff)
parent47f30415ab034ba45d842ec88f65ea35c2b8fb65 (diff)
downloadchromium-webview-temp_p_merge.tar.gz
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_merge
Bug: 79597307 Change-Id: Ib3759a12ff96ecf71d8c46e9bd3ea7ac08a92388
-rw-r--r--README8
-rw-r--r--prebuilt/arm/webview.apkbin33874192 -> 33504710 bytes
-rw-r--r--prebuilt/arm64/webview.apkbin59586551 -> 62348896 bytes
-rw-r--r--prebuilt/x86/webview.apkbin38980384 -> 39407038 bytes
-rw-r--r--prebuilt/x86_64/webview.apkbin66708183 -> 69230165 bytes
5 files changed, 4 insertions, 4 deletions
diff --git a/README b/README
index 788ff11..19e5378 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@ https://www.chromium.org/developers/how-tos/build-instructions-android-webview
------
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 @@ in your GN argument file before building.
------
-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