commit af96ba264deb820cb895a98c959216d1ba7e1348
author Steve Kondik <shade@chemlab.org> Mon Dec 24 00:14:23 2012 -0800
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> Mon Dec 24 00:14:23 2012 -0800
tree 16268663688b84635b71e575ca5d91308590d126
parent 901e88504b44ab6d19bf7e91d160f95a9bd52b9b
parent 7718d2ac052c5de27e02b5ceb68489783a9577ab

Merge "Fix copy JNI files of Term.apk" into cm-10.1

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index b776cd8..3a42ca2 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -99,9 +99,24 @@
 PRODUCT_COPY_FILES += \
     vendor/cm/prebuilt/common/bin/modelid_cfg.sh:system/bin/modelid_cfg.sh
 
+PRODUCT_COPY_FILES += \
+    vendor/cm/proprietary/Term.apk:system/app/Term.apk
+
+# Copy JNI libarary of Term
+ifeq ($(TARGET_ARCH),arm)
 PRODUCT_COPY_FILES +=  \
-    vendor/cm/proprietary/Term.apk:system/app/Term.apk \
     vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+endif
+
+ifeq ($(TARGET_ARCH),mips)
+PRODUCT_COPY_FILES +=  \
+    vendor/cm/proprietary/lib/mips/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+PRODUCT_COPY_FILES +=  \
+    vendor/cm/proprietary/lib/x86/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+endif
 
 # Bring in camera effects
 PRODUCT_COPY_FILES +=  \

get-prebuilts

diff --git a/get-prebuilts b/get-prebuilts
index 1d9493f..e4e3045 100755
--- a/get-prebuilts
+++ b/get-prebuilts
@@ -5,5 +5,5 @@
 
 # Get Android Terminal Emulator (we use a prebuilt so it can update from the Market)
 curl -L -o $BASEDIR/proprietary/Term.apk -O -L https://github.com/downloads/jackpal/Android-Terminal-Emulator/Term.apk
-unzip -o -d $BASEDIR/proprietary $BASEDIR/proprietary/Term.apk lib/armeabi/libjackpal-androidterm4.so
+unzip -o -d $BASEDIR/proprietary $BASEDIR/proprietary/Term.apk lib/*