commit 234ce72b2655c019b75247401d085866e240a69d
author Abhinav Jhanwar <abhinav.jhanwar.august2@gmail.com> Sat Jul 25 11:56:35 2015 -0400
committer Josue Rivera <prbassplayer@gmail.com> Thu Aug 06 05:22:41 2015 +0200
tree b2612f12826199d0d19deeea41a7d109b7d7e9ec
parent beb445eb0b6855382a535cdb8a45784846a9e128

Add 64-bit devices support to chromium prebuilt script

Change-Id: Idaea4ff937a1b9cd437db35b55094bb25423f87c

tools/chromium_prebuilt.sh

diff --git a/tools/chromium_prebuilt.sh b/tools/chromium_prebuilt.sh
index 10fae35..4e2159b 100755
--- a/tools/chromium_prebuilt.sh
+++ b/tools/chromium_prebuilt.sh
@@ -27,7 +27,16 @@
     return 1
 fi
 
+if [[ $ANDROID_PROMPT_PREFIX == *arm* ]]; then
+    ARCH=arm
+fi
+
+if [[ $ANDROID_PROMPT_PREFIX == *arm64* ]]; then
+    ARCH=arm64
+fi
+
 TARGET_DIR=$OUT
+LIBS_64=$TARGET_DIR/system/lib64
 PREBUILT_DIR=$TOP/prebuilts/chromium/$DEVICE
 
 if [ -d $PREBUILT_DIR ]; then
@@ -44,6 +53,12 @@
     cp $TARGET_DIR/system/lib/libwebviewchromium.so $PREBUILT_DIR/lib/libwebviewchromium.so
     cp $TARGET_DIR/system/lib/libwebviewchromium_plat_support.so $PREBUILT_DIR/lib/libwebviewchromium_plat_support.so
     cp $TARGET_DIR/system/lib/libwebviewchromium_loader.so $PREBUILT_DIR/lib/libwebviewchromium_loader.so
+    if [ -d $LIBS_64 ]; then
+    mkdir -p $PREBUILT_DIR/lib64
+    cp $LIBS_64/libwebviewchromium.so $PREBUILT_DIR/lib64/libwebviewchromium.so
+    cp $LIBS_64/libwebviewchromium_plat_support.so $PREBUILT_DIR/lib64/libwebviewchromium_plat_support.so
+    cp $LIBS_64/libwebviewchromium_loader.so $PREBUILT_DIR/lib64/libwebviewchromium_loader.so
+    fi
 else
     echo "Please ensure that you have ran a full build prior to running this script!"
     return 1;
@@ -54,7 +69,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
 
-sed s/__DEVICE__/$DEVICE/g > $PREBUILT_DIR/chromium_prebuilt.mk << EOF
+sed -e s/__DEVICE__/$DEVICE/g -e s/__ARCH__/$ARCH/g > $PREBUILT_DIR/chromium_prebuilt.mk << EOF
 # Copyright (C) 2014 The OmniROM Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -70,6 +85,7 @@
 # limitations under the License.
 
 LOCAL_PATH := prebuilts/chromium/__DEVICE__/
+ARCH := __ARCH__
 
 PRODUCT_COPY_FILES += \\
     \$(LOCAL_PATH)/app/webview/webview.apk:system/app/webview/webview.apk \\
@@ -77,8 +93,22 @@
     \$(LOCAL_PATH)/lib/libwebviewchromium_plat_support.so:system/lib/libwebviewchromium_plat_support.so \\
     \$(LOCAL_PATH)/lib/libwebviewchromium_loader.so:system/lib/libwebviewchromium_loader.so
 
+ifeq (\$(ARCH),arm64)
+PRODUCT_COPY_FILES += \\
+    \$(LOCAL_PATH)/lib64/libwebviewchromium.so:system/lib64/libwebviewchromium.so \\
+    \$(LOCAL_PATH)/lib64/libwebviewchromium_plat_support.so:system/lib64/libwebviewchromium_plat_support.so \\
+    \$(LOCAL_PATH)/lib64/libwebviewchromium_loader.so:system/lib64/libwebviewchromium_loader.so
+endif
+
+ifeq (\$(ARCH),arm)
 \$(shell mkdir -p out/target/product/__DEVICE__/system/app/webview/lib/arm/)
 \$(shell cp -r \$(LOCAL_PATH)/app/webview/lib/arm/libwebviewchromium.so out/target/product/__DEVICE__/system/app/webview/lib/arm/libwebviewchromium.so)
+endif
+
+ifeq (\$(ARCH),arm64)
+\$(shell mkdir -p out/target/product/__DEVICE__/system/app/webview/lib/arm64/)
+\$(shell cp -r \$(LOCAL_PATH)/app/webview/lib/arm64/libwebviewchromium.so out/target/product/__DEVICE__/system/app/webview/lib/arm64/libwebviewchromium.so)
+endif
 
 EOF