diff options
author | Xin Li <delphij@google.com> | 2017-12-06 11:51:50 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2017-12-06 14:24:46 -0800 |
commit | 566a38bfcf260c9cf94af0a82f9c3551b9830926 (patch) | |
tree | 52aa623a2a763cc496dd0d077f5c3078008bcb96 | |
parent | 4976d3ad0fe241cbc245c7798a2a5ce6b12edc10 (diff) | |
parent | a1fb316a56352971557794f4508f18f26ba069c5 (diff) | |
download | chromium-webview-android-n-iot-release-polk-at1.tar.gz |
DO NOT MERGE: Merge Oreo MR1 into masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: If4adf98c9a7953ad11984403c46349319911cc34
-rw-r--r-- | Android.mk | 3 | ||||
-rw-r--r-- | prebuilt/arm/webview.apk | bin | 33924545 -> 33874192 bytes | |||
-rw-r--r-- | prebuilt/arm64/webview.apk | bin | 61021733 -> 59586551 bytes | |||
-rw-r--r-- | prebuilt/mips/webview.apk | bin | 41276286 -> 0 bytes | |||
-rw-r--r-- | prebuilt/x86/webview.apk | bin | 38666997 -> 38980384 bytes | |||
-rw-r--r-- | prebuilt/x86_64/webview.apk | bin | 66862538 -> 66708183 bytes |
6 files changed, 1 insertions, 2 deletions
@@ -28,13 +28,12 @@ LOCAL_REQUIRED_MODULES := \ libwebviewchromium_loader \ libwebviewchromium_plat_support -LOCAL_MODULE_TARGET_ARCH := arm arm64 mips x86 x86_64 +LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64 my_src_arch := $(call get-prebuilt-src-arch,$(LOCAL_MODULE_TARGET_ARCH)) LOCAL_SRC_FILES := prebuilt/$(my_src_arch)/webview.apk LOCAL_PREBUILT_JNI_LIBS_arm := @lib/armeabi-v7a/libwebviewchromium.so LOCAL_PREBUILT_JNI_LIBS_arm64 := @lib/arm64-v8a/libwebviewchromium.so -LOCAL_PREBUILT_JNI_LIBS_mips := @lib/mips/libwebviewchromium.so LOCAL_PREBUILT_JNI_LIBS_x86 := @lib/x86/libwebviewchromium.so LOCAL_PREBUILT_JNI_LIBS_x86_64 := @lib/x86_64/libwebviewchromium.so diff --git a/prebuilt/arm/webview.apk b/prebuilt/arm/webview.apk Binary files differindex f61462b..5ca3d81 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 ff81804..2ad57a3 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 differdeleted file mode 100644 index 4bde728..0000000 --- a/prebuilt/mips/webview.apk +++ /dev/null diff --git a/prebuilt/x86/webview.apk b/prebuilt/x86/webview.apk Binary files differindex b11473e..79e07e1 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 705ab22..0c22389 100644 --- a/prebuilt/x86_64/webview.apk +++ b/prebuilt/x86_64/webview.apk |