15.08 Update+

- Fix Play services battery drain on arm
- Fixed remove-faceunlock from updater script
- Show some love for who doesn't have realpath
- Export md5 as a file too
- Simplify create checks (@stucki 6a05464df7ae80784fc8fe8ff2de65152d7bb67b)
- Move target zip out of arch directory  (@stucki bf57998702c634f560535b586706931f56a3ed31)
- Clean Up after the build (@stucki f6660501afa1eaefc4d3cf1a043e5c73bdab398d)
- CleanUp final output

build/gapps.sh

@@ -25,26 +25,28 @@ function printdone(){
   echo "$(tput setaf 2)$1$(tput sgr 0)"
 }
 
+function clean(){
+    echo "Cleaning up..."
+    rm -r $OUT/$GARCH
+    rm /tmp/$BUILDZIP
+    return $?
+}
+
+function Gfailed(){
+    printerr "Build failed, check $GLOG"
+    exit 1
+}
+
 function create(){
-    if [ -f $GLOG ]; then
-        rm -f $GLOG
-    fi
+    test -f $GLOG && rm -f $GLOG
     echo "Starting GApps compilation" > $GLOG
     echo "ARCH= $GARCH" >> $GLOG
     echo "OS= $(uname -s -r)" >> $GLOG
     echo "NAME= $(whoami) at $(uname -n)" >> $GLOG
     PREBUILT=$TOP/prebuilt/gapps/$GARCH
-    if [ -d $OUT/$GARCH ]; then
-        echo "Previous build found for $GARCH!" >> $GLOG
-    else
-        echo "No previous build found for $GARCH!" >> $GLOG
-        if [ -d $OUT ]; then
-            echo "OUT directory detected at: $OUT" >> $GLOG
-        else
-            mkdir $OUT
-        fi
-        mkdir $OUT/$GARCH && echo "Created build directories" >> $GLOG
-    fi
+    test -d $OUT || mkdir $OUT;
+    test -d $OUT/$GARCH || mkdir -p $OUT/$GARCH
+    echo "Build directories are now ready" >> $GLOG
     echo "Getting prebuilts..."
     echo "Copying stuffs" >> $GLOG
     cp -r $PREBUILT $OUT/$GARCH >> $GLOG
@@ -53,7 +55,7 @@ function create(){
 }
 
 function zipit(){
-    BUILDZIP=gapps-$ANDROIDV-$DATE.zip
+    BUILDZIP=gapps-$ANDROIDV-$GARCH-$DATE.zip
     echo "Importing installation scripts..."
     cp -r $METAINF $OUT/$GARCH/META-INF && echo "Meta copied" >> $GLOG
     echo "Creating package..."
@@ -63,7 +65,7 @@ function zipit(){
     cd $TOP
     if [ -f /tmp/$BUILDZIP ]; then
         echo "Signing zip..."
-        java -Xmx2048m -jar $TOP/build/sign/signapk.jar -w $TOP/build/sign/testkey.x509.pem $TOP/build/sign/testkey.pk8 /tmp/$BUILDZIP $OUT/$GARCH/$BUILDZIP >> $GLOG
+        java -Xmx2048m -jar $TOP/build/sign/signapk.jar -w $TOP/build/sign/testkey.x509.pem $TOP/build/sign/testkey.pk8 /tmp/$BUILDZIP $OUT/$BUILDZIP >> $GLOG
     else
         printerr "Couldn't zip files!"
         echo "Couldn't find unsigned zip file, aborting" >> $GLOG
@@ -75,7 +77,9 @@ function getmd5(){
     if [ -x $(which md5sum) ]; then
         echo "md5sum is installed, getting md5..." >> $GLOG
         echo "Getting md5sum..."
-        GMD5=$(md5sum $OUT/$GARCH/$BUILDZIP)
+        GMD5=$(md5sum $OUT/$BUILDZIP)
+        echo -e "$GMD5" > $OUT/gapps-$ANDROIDV-$GARCH-$DATE.md5
+        echo "md5 exported at $OUT/gapps-$ANDROIDV-$GARCH-$DATE.md5"
         return 0
     else
         echo "md5sum is not installed, aborting" >> $GLOG
@@ -89,6 +93,12 @@ function getmd5(){
 GARCH=$1
 create
 LASTRETURN=$?
+if [ -x $(which realpath) ]; then
+    echo "Realpath found!" >> $GLOG
+else
+    TOP=$(cd . && pwd) # some os X love
+    echo "No realpath found!" >> $GLOG
+fi
 if [ "$LASTRETURN" == 0 ]; then
     zipit
     LASTRETURN=$?
@@ -96,19 +106,21 @@ if [ "$LASTRETURN" == 0 ]; then
         getmd5
         LASTRETURN=$?
         if [ "$LASTRETURN" == 0 ]; then
-            echo "Done!" >> $GLOG
-            printdone "Build completed: $OUT/$GARCH/$BUILDZIP"
-            printdone "            md5: $GMD5"
-            exit 0
+            clean
+            LASTRETURN=$?
+            if [ "$LASTRETURN" == 0 ]; then
+                echo "Done!" >> $GLOG
+                printdone "Build completed: $GMD5"
+                exit 0
+            else
+                Gfailed
+            fi
         else
-            printerr "Build failed, check $GLOG"
-            exit 1
+            Gfailed
         fi
     else
-        printerr "Build failed, check $GLOG"
-        exit 1
+        Gfailed
     fi
 else
-    printerr "Build failed, check $GLOG"
-    exit 1
+    Gfailed
 fi

build/meta/com/google/android/updater-script

@@ -5,8 +5,8 @@ show_progress(1, 15);
 package_extract_dir("arch", "/system");
 package_extract_dir("common", "/system");
 set_perm(0, 0, 0777, "/system/gapps_scripts.sh");
-run_program("/systen/gapps_scripts.sh", "");
-delete("/system/gapps_scripts");
+run_program("/system/gapps_scripts.sh", "");
+delete("/system/gapps_scripts.sh");
 show_progress(1, 15);
 set_metadata_recursive("/system/addon.d", "uid", 0, "gid", 0, "dmode", 0755, "fmode", 0755, "capabilities", 0x0, "selabel", "u:object_r:system_file:s0");
 set_metadata_recursive("/system/app", "uid", 0, "gid", 0, "dmode", 0755, "fmode", 0644, "capabilities", 0x0, "selabel", "u:object_r:system_file:s0");

out/arm/arch/addon.d/30-gapps.sh

@@ -0,0 +1,76 @@
+#!/sbin/sh
+#
+# /system/addon.d/70-gapps.sh
+#
+. /tmp/backuptool.functions
+
+list_files() {
+cat <<EOF
+addon.d/30-gapps.sh
+app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
+app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
+etc/permissions/com.google.android.camera2.xml
+etc/permissions/com.google.android.maps.xml
+etc/permissions/com.google.android.media.effects.xml
+etc/permissions/com.google.widevine.software.drm.xml
+etc/permissions/features.xml
+framework/com.google.camera2.jar
+framework/com.google.android.maps.jar
+framework/com.google.android.media.effects.jar
+framework/com.google.widevine.software.drm.jar
+lib/libfilterpack_facedetect.so
+lib/libgoogle_hotword_jni.so
+lib/libgoogle_recognizer_jni_l.so
+lib/libjni_latinimegoogle.so
+priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
+priv-app/GoogleFeedback/GoogleFeedback.apk
+priv-app/GoogleLoginService/GoogleLoginService.apk
+priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
+priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
+priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
+priv-app/Phonesky/Phonesky.apk
+priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
+priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
+priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
+priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
+priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
+priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
+priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
+priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
+priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
+priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
+priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
+priv-app/Velvet/lib/arm/libvcdecoder_jni.so
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac

out/arm/arch/addon.d/31-faceunlock.sh

@@ -0,0 +1,54 @@
+#!/sbin/sh
+#
+# /system/addon.d/71-gapps-faceunlock.sh
+#
+
+. /tmp/backuptool.functions
+
+
+
+
+list_files() {
+cat <<EOF
+app/FaceLock/FaceLock.apk
+app/FaceLock/lib/arm/libfacelock_jni.so
+lib/libfacelock_jni.so
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
+vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac

out/arm/arch/arm/addon.d/30-gapps.sh

@@ -0,0 +1,76 @@
+#!/sbin/sh
+#
+# /system/addon.d/70-gapps.sh
+#
+. /tmp/backuptool.functions
+
+list_files() {
+cat <<EOF
+addon.d/30-gapps.sh
+app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
+app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
+etc/permissions/com.google.android.camera2.xml
+etc/permissions/com.google.android.maps.xml
+etc/permissions/com.google.android.media.effects.xml
+etc/permissions/com.google.widevine.software.drm.xml
+etc/permissions/features.xml
+framework/com.google.camera2.jar
+framework/com.google.android.maps.jar
+framework/com.google.android.media.effects.jar
+framework/com.google.widevine.software.drm.jar
+lib/libfilterpack_facedetect.so
+lib/libgoogle_hotword_jni.so
+lib/libgoogle_recognizer_jni_l.so
+lib/libjni_latinimegoogle.so
+priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
+priv-app/GoogleFeedback/GoogleFeedback.apk
+priv-app/GoogleLoginService/GoogleLoginService.apk
+priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
+priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
+priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
+priv-app/Phonesky/Phonesky.apk
+priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
+priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
+priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
+priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
+priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
+priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
+priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
+priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
+priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
+priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
+priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
+priv-app/Velvet/lib/arm/libvcdecoder_jni.so
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac

out/arm/arch/arm/addon.d/31-faceunlock.sh

@@ -0,0 +1,54 @@
+#!/sbin/sh
+#
+# /system/addon.d/71-gapps-faceunlock.sh
+#
+
+. /tmp/backuptool.functions
+
+
+
+
+list_files() {
+cat <<EOF
+app/FaceLock/FaceLock.apk
+app/FaceLock/lib/arm/libfacelock_jni.so
+lib/libfacelock_jni.so
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
+vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac

out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so

@@ -0,0 +1 @@
+/system/lib/libgoogle_hotword_jni.so

out/arm/arch/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so

@@ -0,0 +1 @@
+/system/lib/libvcdecoder_jni.so

out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so

@@ -0,0 +1 @@
+/system/lib/libgoogle_hotword_jni.so

out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so

@@ -0,0 +1 @@
+/system/lib/libgoogle_recognizer_jni_l.so

out/arm/arch/priv-app/Velvet/lib/arm/libvcdecoder_jni.so

@@ -0,0 +1 @@
+/system/lib/libvcdecoder_jni.so

out/arm/arm/addon.d/30-gapps.sh

@@ -0,0 +1,76 @@
+#!/sbin/sh
+#
+# /system/addon.d/70-gapps.sh
+#
+. /tmp/backuptool.functions
+
+list_files() {
+cat <<EOF
+addon.d/30-gapps.sh
+app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
+app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
+etc/permissions/com.google.android.camera2.xml
+etc/permissions/com.google.android.maps.xml
+etc/permissions/com.google.android.media.effects.xml
+etc/permissions/com.google.widevine.software.drm.xml
+etc/permissions/features.xml
+framework/com.google.camera2.jar
+framework/com.google.android.maps.jar
+framework/com.google.android.media.effects.jar
+framework/com.google.widevine.software.drm.jar
+lib/libfilterpack_facedetect.so
+lib/libgoogle_hotword_jni.so
+lib/libgoogle_recognizer_jni_l.so
+lib/libjni_latinimegoogle.so
+priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
+priv-app/GoogleFeedback/GoogleFeedback.apk
+priv-app/GoogleLoginService/GoogleLoginService.apk
+priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
+priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
+priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
+priv-app/Phonesky/Phonesky.apk
+priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
+priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
+priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
+priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
+priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
+priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
+priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
+priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
+priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
+priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
+priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
+priv-app/Velvet/lib/arm/libvcdecoder_jni.so
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac

out/arm/arm/addon.d/31-faceunlock.sh

@@ -0,0 +1,54 @@
+#!/sbin/sh
+#
+# /system/addon.d/71-gapps-faceunlock.sh
+#
+
+. /tmp/backuptool.functions
+
+
+
+
+list_files() {
+cat <<EOF
+app/FaceLock/FaceLock.apk
+app/FaceLock/lib/arm/libfacelock_jni.so
+lib/libfacelock_jni.so
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
+vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac

out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so

@@ -0,0 +1 @@
+/system/lib/libgoogle_hotword_jni.so

out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so

@@ -0,0 +1 @@
+/system/lib/libgoogle_recognizer_jni_l.so

out/arm/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so

@@ -0,0 +1 @@
+/system/lib/libvcdecoder_jni.so

out/arm/common/etc/permissions/com.google.android.camera2.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <library name="com.google.android.camera2"
+            file="/system/framework/com.google.android.camera2.jar" />
+</permissions>

out/arm/common/etc/permissions/com.google.android.maps.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <library name="com.google.android.maps"
+            file="/system/framework/com.google.android.maps.jar" />
+</permissions>

out/arm/common/etc/permissions/com.google.android.media.effects.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <library name="com.google.android.media.effects"
+            file="/system/framework/com.google.android.media.effects.jar" />
+
+</permissions>

out/arm/common/etc/permissions/com.google.widevine.software.drm.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+      Copyright (C) 2011 Google, Inc.  All Rights Reserved
+-->
+<permissions>
+    <library name="com.google.widevine.software.drm"
+        file="/system/framework/com.google.widevine.software.drm.jar"/>
+</permissions>

out/arm/common/gapps_scripts.sh

@@ -0,0 +1,28 @@
+#!/sbin/sh
+
+good_ffc_device() {
+  if cat /proc/cpuinfo |grep -q Victory; then
+    return 1
+  fi
+  if cat /proc/cpuinfo |grep -q herring; then
+    return 1
+  fi
+  if cat /proc/cpuinfo |grep -q sun4i; then
+    return 1
+  fi
+  return 0
+}
+
+chmod 755 /system/addon.d/30-gapps.sh
+if [ -f "/system/addon.d/faceunlock.sh" ]; then
+    chmod 755 /system/addon.d/31-faceunlock.sh
+fi
+if good_ffc_device && [ -e /system/etc/permissions/android.hardware.camera.front.xml ]; then
+  chmod 755 /system/addon.d/31-faceunlock.sh
+elif  [ -d /system/vendor/pittpatt/ ]; then
+  rm -rf /system/vendor/pittpatt/
+  rm -rf /system/app/FaceLock/
+  rm  -f /system/lib/libfacelock_jni.so
+  rm  -f /system/addon.d/31-faceunlock.sh
+fi
+rm -rf /tmp/face