diff options
| author | Torne (Richard Coles) <torne@google.com> | 2016-09-21 16:33:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-21 16:33:16 +0000 |
| commit | 38660e5dfc2815e881a9d606699d21db544fc5ac (patch) | |
| tree | 821ba50e2a3168bb8fd08202408d092f87882e2f | |
| parent | 7895f9be6b7af84d455af423bf60f3210fbb6b68 (diff) | |
| parent | 3b1cbcd66abd48cf57124a380714576883fa77be (diff) | |
| download | chromium-webview-38660e5dfc2815e881a9d606699d21db544fc5ac.tar.gz | |
resolve merge conflicts of e9d901a to nyc-dev
am: 3b1cbcd66a
Change-Id: I0883684d7b4f82d7dea7d192125a5d46d68b96ae
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | prebuilt/arm/webview.apk | bin | 29630566 -> 29995238 bytes | |||
| -rw-r--r-- | prebuilt/arm64/webview.apk | bin | 54011870 -> 54830088 bytes | |||
| -rw-r--r-- | prebuilt/mips/webview.apk | bin | 35423083 -> 36002783 bytes | |||
| -rw-r--r-- | prebuilt/x86/webview.apk | bin | 33520730 -> 33968574 bytes | |||
| -rw-r--r-- | prebuilt/x86_64/webview.apk | bin | 57877605 -> 58761042 bytes |
6 files changed, 2 insertions, 3 deletions
@@ -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 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 @@ enable_resource_whitelist_generation=true 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 Binary files differindex 146244a..fe763b1 100644 --- a/prebuilt/arm/webview.apk +++ b/prebuilt/arm/webview.apk diff --git a/prebuilt/arm64/webview.apk b/prebuilt/arm64/webview.apk Binary files differindex 65ff538..e7c8639 100644 --- a/prebuilt/arm64/webview.apk +++ b/prebuilt/arm64/webview.apk diff --git a/prebuilt/mips/webview.apk b/prebuilt/mips/webview.apk Binary files differindex 954fc88..750ca6a 100644 --- a/prebuilt/mips/webview.apk +++ b/prebuilt/mips/webview.apk diff --git a/prebuilt/x86/webview.apk b/prebuilt/x86/webview.apk Binary files differindex b9cff2c..bc9fea0 100644 --- a/prebuilt/x86/webview.apk +++ b/prebuilt/x86/webview.apk diff --git a/prebuilt/x86_64/webview.apk b/prebuilt/x86_64/webview.apk Binary files differindex 5480727..b0d4e10 100644 --- a/prebuilt/x86_64/webview.apk +++ b/prebuilt/x86_64/webview.apk |