resolve merge conflicts of e9d901a to nyc-dev
Change-Id: Ic0a5d1893786ae8a6a5b207f01da14ed93bfac0a
diff --git a/README b/README
index 7586d68..febe77c 100644
--- a/README
+++ b/README
@@ -7,7 +7,7 @@
------
The prebuilt libwebviewchromium.so included in these APKs is built from Chromium
-release tag 51.0.2704.91, using the GN build tool (not the older GYP tool). To match our build settings, set:
+release tag 52.0.2743.100, using the GN build tool (not the older GYP tool). To match our build settings, set:
target_os="android"
is_debug=false
@@ -19,13 +19,12 @@
ffmpeg_branding="Chrome"
proprietary_codecs=true
enable_remoting=true
-android_chrome_build_id="c212fd71-e1d3-4b49-9f08-878f16747dd9"
in your GN argument file before building.
------
-Due to WebView API changes in the N release, the Java code in the Chromium 2704_81
+Due to WebView API changes in the N release, the Java code in the Chromium 2743_91
branch is not compatible with N. We'll be working on upstreaming the N-specific
Java changes to Chromium once the final N SDK is released.
diff --git a/prebuilt/arm/webview.apk b/prebuilt/arm/webview.apk
index 146244a..fe763b1 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 65ff538..e7c8639 100644
--- a/prebuilt/arm64/webview.apk
+++ b/prebuilt/arm64/webview.apk
Binary files differ
diff --git a/prebuilt/mips/webview.apk b/prebuilt/mips/webview.apk
index 954fc88..750ca6a 100644
--- a/prebuilt/mips/webview.apk
+++ b/prebuilt/mips/webview.apk
Binary files differ
diff --git a/prebuilt/x86/webview.apk b/prebuilt/x86/webview.apk
index b9cff2c..bc9fea0 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 5480727..b0d4e10 100644
--- a/prebuilt/x86_64/webview.apk
+++ b/prebuilt/x86_64/webview.apk
Binary files differ
