From 976e704892c73cbcdd4f434788c42e23df3c2155 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Mon, 8 Dec 2014 12:34:29 +0000 Subject: Use a prebuilt webview APK. Provide a prebuilt binary of webview, replacing the version built from source in frameworks/webview/chromium/Android.mk. The cleanspec will delete any old libwebviewchromium.so installed systemwide and any symlinks to it that may have been in /system/app/webview/lib, as the prebuilt's library is directly stored in the webview lib directory instead of in /system/lib. The initial prebuilts here are from ub-webview-m40 build 1628204 and are based on Chromium 40.0.2214.27. Bug: 18255219 Change-Id: I55aa833dedbe11fd99d9e3579056d2e97bbf2032 --- Android.mk | 41 ++++++++++++++++++++++++++++++++++ CleanSpec.mk | 52 ++++++++++++++++++++++++++++++++++++++++++++ prebuilt/arm/webview.apk | Bin 0 -> 20942093 bytes prebuilt/arm64/webview.apk | Bin 0 -> 46229802 bytes prebuilt/mips/webview.apk | Bin 0 -> 30127958 bytes prebuilt/x86/webview.apk | Bin 0 -> 25961435 bytes prebuilt/x86_64/webview.apk | Bin 0 -> 49513048 bytes 7 files changed, 93 insertions(+) create mode 100644 Android.mk create mode 100644 CleanSpec.mk create mode 100644 prebuilt/arm/webview.apk create mode 100644 prebuilt/arm64/webview.apk create mode 100644 prebuilt/mips/webview.apk create mode 100644 prebuilt/x86/webview.apk create mode 100644 prebuilt/x86_64/webview.apk diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..811af65 --- /dev/null +++ b/Android.mk @@ -0,0 +1,41 @@ +# +# Copyright (C) 2014 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Install the prebuilt webview apk. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := webview +LOCAL_MODULE_CLASS := APPS +LOCAL_MULTILIB := both +LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) +LOCAL_REQUIRED_MODULES := \ + libwebviewchromium_loader \ + libwebviewchromium_plat_support + +LOCAL_MODULE_TARGET_ARCH := arm arm64 mips 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 + +include $(BUILD_PREBUILT) diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 0000000..9c16618 --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,52 @@ +# Copyright (C) 2014 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# If you don't need to do a full clean build but would like to touch +# a file or delete some intermediate files, add a clean step to the end +# of the list. These steps will only be run once, if they haven't been +# run before. +# +# E.g.: +# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) +# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) +# +# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with +# files that are missing or have been moved. +# +# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. +# Use $(OUT_DIR) to refer to the "out" directory. +# +# If you need to re-do something that's already mentioned, just copy +# the command and add it to the bottom of the list. E.g., if a change +# that you made last week required touching a file and a change you +# made today requires touching the same file, just copy the old +# touch step and add it to the end of the list. +# +# ***************************************************************** +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THE BANNER +# ***************************************************************** + +# For example: +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) +#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) +#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libwebviewchromium.so) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libwebviewchromium.so) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/webview) + +# ****************************************************************** +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER +# ****************************************************************** diff --git a/prebuilt/arm/webview.apk b/prebuilt/arm/webview.apk new file mode 100644 index 0000000..677b19b Binary files /dev/null and b/prebuilt/arm/webview.apk differ diff --git a/prebuilt/arm64/webview.apk b/prebuilt/arm64/webview.apk new file mode 100644 index 0000000..685e6ae Binary files /dev/null and b/prebuilt/arm64/webview.apk differ diff --git a/prebuilt/mips/webview.apk b/prebuilt/mips/webview.apk new file mode 100644 index 0000000..f2f093a Binary files /dev/null and b/prebuilt/mips/webview.apk differ diff --git a/prebuilt/x86/webview.apk b/prebuilt/x86/webview.apk new file mode 100644 index 0000000..1322d08 Binary files /dev/null and b/prebuilt/x86/webview.apk differ diff --git a/prebuilt/x86_64/webview.apk b/prebuilt/x86_64/webview.apk new file mode 100644 index 0000000..47c963c Binary files /dev/null and b/prebuilt/x86_64/webview.apk differ -- cgit v1.1