commit 36c3876541ea62ab5e849ee13d991188ad571f3d
author Iftekhar Rifat <rifat662@gmail.com> Sun Jun 21 20:30:07 2015 +0600
committer Iftekhar Rifat <rifat662@gmail.com> Sun Jun 21 20:35:09 2015 +0600
tree b9b6d5a8a909f9c29fc809da2c3b060117c72da8
parent ba9b4e29fb40c8d2b3e42a463f600c11bcdbd62f

vendor/omni: Fixup prebuilt chromium for lollipop

 - remove call to chromium_prebuilt.mk
 - update chromium_prebuilt.sh to create an Android.mk for
   libwebviewchromium instead of chromium_prebuilt.mk.
 - In this way, webview package can pick it up with
   LOCAL_REQUIRED_MODULE and create necessary symlink
   by using LOCAL_JNI_SHARED_LIBRARIES.

Change-Id: I173eb7cfd83234bc4cd602b3a0009b97041d25e1
Signed-off-by: Iftekhar Rifat <rifat662@gmail.com>

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index aa00a95..2bc6015 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -53,11 +53,6 @@
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
 
-# Chromium Prebuilt
-ifeq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes)
--include prebuilts/chromium/$(TARGET_DEVICE)/chromium_prebuilt.mk
-endif
-
 # Dashclock
 #PRODUCT_COPY_FILES += \
 #    vendor/omni/prebuilt/app/DashClock.apk:system/app/DashClock.apk

utils/chromium_prebuilt.sh

diff --git a/utils/chromium_prebuilt.sh b/utils/chromium_prebuilt.sh
index f33fac1..c449fd7 100755
--- a/utils/chromium_prebuilt.sh
+++ b/utils/chromium_prebuilt.sh
@@ -41,9 +41,8 @@
 
 if [ -d $TARGET_DIR ]; then
     echo "Copying files..."
-    cp -r $TARGET_DIR/system/app/webview $PREBUILT_DIR/app/
+    cp $TARGET_DIR/system/app/webview/webview.apk $PREBUILT_DIR/app/webview.apk
     cp $TARGET_DIR/system/lib/libwebviewchromium.so $PREBUILT_DIR/lib/libwebviewchromium.so
-    cp $TARGET_DIR/../../common/obj/JAVA_LIBRARIES/android_webview_java_intermediates/javalib.jar $PREBUILT_DIR/android_webview_java.jar
 else
     echo "Please ensure that you have ran a full build prior to running this script!"
     return 1;
@@ -54,7 +53,7 @@
 HASH=$(git --git-dir=$TOP/external/chromium_org/.git --work-tree=$TOP/external/chromium_org rev-parse --verify HEAD)
 echo $HASH > $PREBUILT_DIR/hash.txt
 
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > $PREBUILT_DIR/chromium_prebuilt.mk
+(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > $PREBUILT_DIR/Android.mk
 # Copyright (C) 2014 The OmniROM Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -71,9 +70,20 @@
 
 LOCAL_PATH := prebuilts/chromium/__DEVICE__/
 
-PRODUCT_COPY_FILES += \\
-    \$(LOCAL_PATH)/app/webview.apk:system/app/webview/webview.apk \\
-    \$(LOCAL_PATH)/lib/libwebviewchromium.so:system/lib/libwebviewchromium.so
+ifeq (\$(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes)
+
+include \$(CLEAR_VARS)
+
+LOCAL_MODULE := libwebviewchromium
+LOCAL_SRC_FILES := lib/libwebviewchromium.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+
+include \$(BUILD_PREBUILT)
+
+endif
+
 
 EOF