[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/piggz/sailfish-fpd-community.git</param>
<param name="branch">master</param>
- <param name="revision">1.1.1</param>
+ <param name="revision">HEAD</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:copy-hal.sh
^
|
@@ -4,23 +4,32 @@
OUT_DEVICE=${HABUILD_DEVICE:-$DEVICE}
-if [ ! -f ./out/target/product/${OUT_DEVICE}/system/lib/libbiometry_fp_api.so ]; then
+if [ -f out/target/product/${OUT_DEVICE}/system/lib64/libbiometry_fp_api.so ]; then
+ DROIDLIB=lib64
+else
+ DROIDLIB=lib
+fi
+
+if [ ! -f ./out/target/product/${OUT_DEVICE}/system/${DROIDLIB}/libbiometry_fp_api.so ]; then
echo "Please build Fingerprint support as per HADK instructions"
exit 1
fi
-
-
-fold=$(dirname "$0")/../out
+pkg=droid-biometry-fp-0.0.0
+fold=$(dirname "$0")/../$pkg
rm -rf $fold
mkdir $fold
-mv ./out/target/product/${OUT_DEVICE}/system/lib/libbiometry_fp_api.so $fold
+mkdir -p $fold/out/target/product/${OUT_DEVICE}/system/${DROIDLIB}
+mv ./out/target/product/${OUT_DEVICE}/system/${DROIDLIB}/libbiometry_fp_api.so $fold/out/target/product/${OUT_DEVICE}/system/${DROIDLIB}/
if [ -f ./out/target/product/${OUT_DEVICE}/system/bin/fake_crypt ]; then
-mv ./out/target/product/${OUT_DEVICE}/system/bin/fake_crypt $fold
-mv ./out/target/product/${OUT_DEVICE}/system/etc/init/fake_crypt.rc $fold
-sed -i 's+/system/bin/fake_crypt+/usr/libexec/droid-hybris/system/bin/fake_crypt+g' $fold/fake_crypt.rc
+mkdir -p $fold/out/target/product/${OUT_DEVICE}/system/bin
+mkdir -p $fold/out/target/product/${OUT_DEVICE}/system/etc/init
+mv ./out/target/product/${OUT_DEVICE}/system/bin/fake_crypt $fold/out/target/product/${OUT_DEVICE}/system/bin/
+mv ./out/target/product/${OUT_DEVICE}/system/etc/init/fake_crypt.rc $fold/out/target/product/${OUT_DEVICE}/system/etc/init/
+sed -i 's+/system/bin/fake_crypt+/usr/libexec/droid-hybris/system/bin/fake_crypt+g' $fold/out/target/product/${OUT_DEVICE}/system/etc/init/fake_crypt.rc
fi
ls -lh $fold
+tar -cjvf $fold.tgz -C $(dirname $fold) $pkg
|