15.06 Update:

- x86 files (kindly given by @balika011) > 1cfeda8a9dbe1a328259edb42f48f0e4ea716072
- Update compilation script

Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

prebuilt/gapps/arm/addon.d/31-faceunlock.sh

@@ -12,6 +12,7 @@ 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

prebuilt/gapps/arm/app/FaceLock/lib/arm/libfacelock_jni.so

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

prebuilt/gapps/arm64/addon.d/30-gapps.sh

@@ -29,6 +29,7 @@ priv-app/GoogleLoginService/GoogleLoginService.apk
 priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
 priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
 priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
+priv-app/Hotword/Hotword.apk
 priv-app/Phonesky/Phonesky.apk
 priv-app/PrebuiltGmsCore/PreBuiltGmsCore.apk
 priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so

prebuilt/gapps/arm64/addon.d/31-faceunlock.sh

@@ -12,6 +12,7 @@ list_files() {
 cat <<EOF
 app/FaceLock/FaceLock.apk
 app/FaceLock/lib/arm/libfacelock_jni.so
+lib/libfacelock_jni.so
 lib64/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

prebuilt/gapps/arm64/etc/permissions/com.google.android.camera2.xml

@@ -1,20 +0,0 @@
-<?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>

prebuilt/gapps/arm64/etc/permissions/com.google.android.dialer.support.xml

@@ -1,4 +0,0 @@
-<permissions>
-    <library name="com.google.android.dialer.support"
-            file="/system/framework/com.google.android.dialer.support.jar" />
-</permissions>

prebuilt/gapps/arm64/etc/permissions/com.google.android.maps.xml

@@ -1,20 +0,0 @@
-<?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>

prebuilt/gapps/arm64/etc/permissions/com.google.android.media.effects.xml

@@ -1,21 +0,0 @@
-<?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>

prebuilt/gapps/arm64/etc/permissions/com.google.widevine.software.drm.xml

@@ -1,8 +0,0 @@
-<?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>

prebuilt/gapps/arm64/etc/permissions/features.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<!-- This is the standard set of features for an auto-focus camera. -->
-<permissions>
-    <feature name="com.google.android.feature.GOOGLE_BUILD" />
-<!-- This should be added to all Nexus and GPe devices -->
-    <feature name="com.google.android.feature.GOOGLE_EXPERIENCE" />
-</permissions>
-

prebuilt/gapps/arm64/faceunlock.sh

@@ -1,24 +0,0 @@
-#!/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
-}
-
-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  -f /system/app/FaceLock.apk
-  rm  -f /system/lib/libfacelock_jni.so
-  rm  -f /system/addon.d/31-faceunlock.sh
-fi
-rm -rf /tmp/face

prebuilt/gapps/common/gapps_scripts.sh

@@ -13,6 +13,10 @@ good_ffc_device() {
   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

prebuilt/gapps/x86/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/x86/libAppDataSearch.so
+priv-app/PrebuiltGmsCore/lib/x86/libconscrypt_gmscore_jni.so
+priv-app/PrebuiltGmsCore/lib/x86/libgames_rtmp_jni.so
+priv-app/PrebuiltGmsCore/lib/x86/libgcastv2_base.so
+priv-app/PrebuiltGmsCore/lib/x86/libgcastv2_support.so
+priv-app/PrebuiltGmsCore/lib/x86/libgmscore.so
+priv-app/PrebuiltGmsCore/lib/x86/libgms-ocrclient.so
+priv-app/PrebuiltGmsCore/lib/x86/libjgcastservice.so
+priv-app/PrebuiltGmsCore/lib/x86/libsslwrapper_jni.so
+priv-app/PrebuiltGmsCore/lib/x86/libWhisper.so
+priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
+priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
+priv-app/Velvet/lib/x86/libgoogle_hotword_jni.so
+priv-app/Velvet/lib/x86/libgoogle_recognizer_jni_l.so
+priv-app/Velvet/lib/x86/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

prebuilt/gapps/x86/addon.d/31-faceunlock.sh

@@ -0,0 +1,53 @@
+#!/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
+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

prebuilt/gapps/x86/placeholder

@@ -1 +0,0 @@
-x86 gapps will come in future