Changes of Revision 3
[-] [+] | Added | _service:tar_git:sailfish-fpd-community.changes |
[-] [+] | Changed | _service:tar_git:sailfish-fpd-community.spec ^ |
Changed | _service ^ | |
[-] [+] | Changed | _service:tar_git:copy-hal.sh ^ |
@@ -4,14 +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 -cp ./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 +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 | ||
[-] [+] | Changed | _service:tar_git:sailfish-fpd-community-1.1.2.tar.bz2/README.md ^ |
@@ -20,7 +20,7 @@ ## How to build for a device -### Android Library +### Android Library/Binary In HADK: @@ -29,11 +29,24 @@ export USE_CCACHE=1 lunch aosp_$DEVICE-user (or appropriate name) make libbiometry_fp_api_32 + +If the device uses keymaster 4, then an additional service called fake_crypt is required + + git clone https://github.com/erfanoabdi/fake_crypt.git external/fake_crypt + make fake_crypt + +Copy the android parts for packaging + hybris/mw/sailfish-fpd-community/rpm/copy-hal.sh In SDK: rpm/dhd/helpers/build_packages.sh --build=hybris/mw/sailfish-fpd-community --spec=rpm/droid-biometry-fp.spec --do-not-install + +If fake_crypt is required + + rpm/dhd/helpers/build_packages.sh --build=hybris/mw/sailfish-fpd-community --spec=rpm/droid-fake-crypt.spec --do-not-install + ### Daemon | ||
[-] [+] | Changed | _service:tar_git:sailfish-fpd-community-1.1.2.tar.bz2/sailfish-fpd-community.pro ^ |
@@ -12,10 +12,9 @@ # The name of your application TARGET = sailfish-fpd-community +QT -= gui QT += dbus -CONFIG += sailfishapp - LIBS += -lhybris-common SOURCES += src/sailfish-fpd-community.cpp \ @@ -33,7 +32,7 @@ # to disable building translations every time, comment out the # following CONFIG line -CONFIG += sailfishapp_i18n +# CONFIG += sailfishapp_i18n HEADERS += \ src/androidfp.h \ @@ -43,13 +42,10 @@ src/util/property_store.h target.path = /usr/bin/ -systemd_services.path = /lib/systemd/system/ -systemd_services.files = sailfish-fpd-community.service dbus.files = org.sailfishos.fingerprint1.conf dbus.path = /etc/dbus-1/system.d/ INSTALLS += target \ - systemd_services \ dbus |