diff --git a/README.md b/README.md index 5d0e99e..052d604 100644 --- a/README.md +++ b/README.md @@ -2,34 +2,6 @@ **GApps for android devices** - -Information ------------------- - -These are Google Apps for who want to install Google Packages on a custom rom. -Remember Apks and Jars files are prebuilt from Google. -All closed source files come from Nexuses' factory images. -This contains just the core files needed to setup a fully working Google account, -users will choose wich apps they want on their devices. -GApps contain a "quite old" universal Play Service, so the Play Store will download the proper one -for your device asap. -These GApps get monthly updates, fell free to fork and contribute to this, but remember, -**Opensource does not mean out-of-respect**. Also **NO MIRRORS ALLOWED** - - -Downloads ------------------- - -https://github.com/linuxxxxx/vendor_google/releases - - -Links ------------------- -[Google +](https://google.com/+CgappsGithubIo0) -[Community](https://plus.google.com/u/0/b/104503298104020811639/communities/114625799842477562713) -[Website](cgapps.github.io) - - Build ------------------- @@ -38,11 +10,11 @@ You can compile your GApps package with GNU make _make distclean_ - Remove output directory -_make gapps_ +_make arm_ - compile signed flashable GApps for arm -_make gapps_arm64_ +_make arm64_ - compile signed flashable GApps for arm64 -_make gapps_x86_ -- compila signed flashable GApps for x86 (NOT supported atm) +_make x86_ +- compile signed flashable GApps for x86 (NOT supported atm) diff --git a/build/arch/arch.sh b/build/arch/arch.sh new file mode 100644 index 0000000..6de132d --- /dev/null +++ b/build/arch/arch.sh @@ -0,0 +1,28 @@ +#!/sbin/sh +ARCH=$(grep ro.product.cpu.abi= /system/build.prop | cut -d "=" -f 2) +CGAPPS=/tmp/cgapps +GARM=$CGAPPS/arm +GARM64=$CGAPPS/arm64 +GX86=$CGAPPS/x86 + +if [ $ARCH == armeabi-v7a ]; then # arm + cp -r $GARM/app/FaceLock /system/app/FaceLock + cp -r $GARM/priv-app/PrebuiltGmsCore /system/priv-app/PrebuiltGmsCore + cp -r $GARM/priv-app/Velvet /system/priv-app/Velvet + cp -r $GARM/lib /system/lib +elif [ $ARCH == arm64-v8a ]; then # arm64 + cp -r $GARM64/app/FaceLock /system/app/FaceLock + cp -r $GARM64/priv-app/PrebuiltGmsCore /system/priv-app/PrebuiltGmsCore + cp -r $GARM64/priv-app/Velvet /system/priv-app/Velvet + if [ $(grep ro.product.device= /system/build.prop | cut -d "=" -f 2) == "flounder" ]; then + cp -r $GARM64/priv-app/HotWord /system/priv-app/HotWord + fi + cp -r $GARM64/lib /system/lib + cp -r $GARM64/lib64 /system/lib64 + cp -r $GARM64/addon.d /system/addon.d +elif [ $ARCH == x86 ]; then # x86 + cp -r $X86/priv-app/PrebuiltGmsCore /system/priv-app/PrebuiltGmsCore + cp -r $x86/priv-app/Velvet /system/priv-app/Velvet +else # flashing on microwave + echo "Couldn't get info, empty system??" +fi diff --git a/build/gapps.sh b/build/gapps.sh index 764906f..9c67bad 100644 --- a/build/gapps.sh +++ b/build/gapps.sh @@ -5,12 +5,13 @@ ## # var # -DATE=$(date +%F-%H-%M-%S) +DATE=$(date +%F-%H-%M) TOP=$(realpath .) ANDROIDV=5.1 OUT=$TOP/out BUILD=$TOP/build METAINF=$BUILD/meta +COMMON=$TOP/prebuilt/gapps/common ## # functions @@ -26,33 +27,31 @@ function printdone(){ function create(){ PREBUILT=$TOP/prebuilt/gapps/$GARCH if [ -d $OUT/$GARCH ]; then - echo "Previous build found for $GARCH" + echo "Previous build found for $GARCH!" else - echo "No previous build found for $GARCH" + echo "No previous build found for $GARCH!" mkdir $OUT - TARGET=$OUT/$GARCH - mkdir $TARGET - mkdir $TARGET/tmp + mkdir $OUT/$GARCH fi echo "Getting prebuilts..." - cp -r $PREBUILT $TARGET/gapps - return $? + cp -r $PREBUILT $OUT/$GARCH + mv $OUT/$GARCH/$GARCH $OUT/$GARCH/arch + cp -r $COMMON $OUT/$GARCH } function zipit(){ if [ "$LASTRETURN" == 0 ]; then - BUILDZIP=gapps-$ANDROIDV-$GARCH-$DATE.zip + BUILDZIP=gapps-$ANDROIDV-$DATE.zip echo "Importing installation scripts..." - cp -r $TARGET/gapps $TARGET/tmp/system - cp -r $METAINF $TARGET/tmp/META-INF + cp -r $METAINF $OUT/$GARCH/META-INF echo "Creating package..." - cd $TARGET/tmp + cd $OUT/$GARCH zip -r /tmp/$BUILDZIP . &>/dev/null - rm -rf $TARGET/tmp + rm -rf $OUT/tmp 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/$BUILDZIP + 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 else printerr "Couldn't zip files!" return 1 @@ -77,7 +76,7 @@ LASTRETURN=$? zipit LASTRETURN=$? if [ "$LASTRETURN" == 0 ]; then - printdone "Build completed: $OUT/$BUILDZIP" + printdone "Build completed: $OUT/$GARCH/$BUILDZIP" exit 0 else printerr "Build failed, check /tmp/gapps_log" diff --git a/build/main.mk b/build/main.mk index 8c0551f..418d6ca 100644 --- a/build/main.mk +++ b/build/main.mk @@ -9,14 +9,14 @@ distclean : @rm -fr $(OUTDIR) @echo "$(tput setaf 2)Output removed! Ready for a clean build$(tput sgr 0)" -gapps : +arm : @echo "Compiling GApps for arm..." @bash $(BUILD_GAPPS) arm 2>&1 | tee $(LOG_BUILD) -gapps_arm64 : +arm64 : @echo "Compiling GApps for arm64..." @bash $(BUILD_GAPPS) arm64 2>&1 | tee $(LOG_BUILD) -gapps_x86 : - @echo "Compiling GApps for arm64..." +x86 : + @echo "Compiling GApps for x86..." @bash $(BUILD_GAPPS) x86 2>&1 | tee $(LOG_BUILD) diff --git a/build/meta/com/google/android/updater-script b/build/meta/com/google/android/updater-script index 9787a5e..da02655 100644 --- a/build/meta/com/google/android/updater-script +++ b/build/meta/com/google/android/updater-script @@ -1,11 +1,12 @@ ui_print("Installing GApps..."); +run_program("/sbin/busybox", "umount", "/system"); run_program("/sbin/busybox", "mount", "/system"); show_progress(1, 15); -package_extract_dir("system", "/system"); -set_perm(0, 0, 0755, "/system/addon.d/30-gapps.sh"); -package_extract_file("system/faceunlock.sh", "/tmp/faceunlock.sh"); -set_perm(0, 0, 0777, "/tmp/faceunlock.sh"); -run_program("/tmp/faceunlock.sh", ""); +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"); 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"); diff --git a/prebuilt/gapps/arm/addon.d/31-faceunlock.sh b/prebuilt/gapps/arm/addon.d/31-faceunlock.sh index ea56866..aa16b4f 100644 --- a/prebuilt/gapps/arm/addon.d/31-faceunlock.sh +++ b/prebuilt/gapps/arm/addon.d/31-faceunlock.sh @@ -12,6 +12,7 @@ list_files() { cat < - - - - - diff --git a/prebuilt/gapps/arm64/etc/permissions/com.google.android.dialer.support.xml b/prebuilt/gapps/arm64/etc/permissions/com.google.android.dialer.support.xml deleted file mode 100644 index c36ac9d..0000000 --- a/prebuilt/gapps/arm64/etc/permissions/com.google.android.dialer.support.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/prebuilt/gapps/arm64/etc/permissions/com.google.android.maps.xml b/prebuilt/gapps/arm64/etc/permissions/com.google.android.maps.xml deleted file mode 100644 index 5be5c2c..0000000 --- a/prebuilt/gapps/arm64/etc/permissions/com.google.android.maps.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/prebuilt/gapps/arm64/etc/permissions/com.google.android.media.effects.xml b/prebuilt/gapps/arm64/etc/permissions/com.google.android.media.effects.xml deleted file mode 100644 index ea82b9d..0000000 --- a/prebuilt/gapps/arm64/etc/permissions/com.google.android.media.effects.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/prebuilt/gapps/arm64/etc/permissions/com.google.widevine.software.drm.xml b/prebuilt/gapps/arm64/etc/permissions/com.google.widevine.software.drm.xml deleted file mode 100644 index f75abf9..0000000 --- a/prebuilt/gapps/arm64/etc/permissions/com.google.widevine.software.drm.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/prebuilt/gapps/arm64/etc/permissions/features.xml b/prebuilt/gapps/arm64/etc/permissions/features.xml deleted file mode 100644 index 6a69321..0000000 --- a/prebuilt/gapps/arm64/etc/permissions/features.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - diff --git a/prebuilt/gapps/arm64/faceunlock.sh b/prebuilt/gapps/arm64/faceunlock.sh deleted file mode 100644 index d1b7dac..0000000 --- a/prebuilt/gapps/arm64/faceunlock.sh +++ /dev/null @@ -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 diff --git a/prebuilt/gapps/arm64/framework/com.google.android.camera2.jar b/prebuilt/gapps/arm64/framework/com.google.android.camera2.jar deleted file mode 100644 index c1e79c5..0000000 Binary files a/prebuilt/gapps/arm64/framework/com.google.android.camera2.jar and /dev/null differ diff --git a/prebuilt/gapps/arm64/framework/com.google.android.dialer.support.jar b/prebuilt/gapps/arm64/framework/com.google.android.dialer.support.jar deleted file mode 100644 index 8486b93..0000000 Binary files a/prebuilt/gapps/arm64/framework/com.google.android.dialer.support.jar and /dev/null differ diff --git a/prebuilt/gapps/arm64/framework/com.google.android.maps.jar b/prebuilt/gapps/arm64/framework/com.google.android.maps.jar deleted file mode 100644 index dd5d75b..0000000 Binary files a/prebuilt/gapps/arm64/framework/com.google.android.maps.jar and /dev/null differ diff --git a/prebuilt/gapps/arm64/framework/com.google.android.media.effects.jar b/prebuilt/gapps/arm64/framework/com.google.android.media.effects.jar deleted file mode 100644 index ce446b3..0000000 Binary files a/prebuilt/gapps/arm64/framework/com.google.android.media.effects.jar and /dev/null differ diff --git a/prebuilt/gapps/arm64/framework/com.google.widevine.software.drm.jar b/prebuilt/gapps/arm64/framework/com.google.widevine.software.drm.jar deleted file mode 100644 index 572b6a9..0000000 Binary files a/prebuilt/gapps/arm64/framework/com.google.widevine.software.drm.jar and /dev/null differ diff --git a/prebuilt/gapps/arm64/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk b/prebuilt/gapps/arm64/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk deleted file mode 100644 index c43c2a4..0000000 Binary files a/prebuilt/gapps/arm64/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk and /dev/null differ diff --git a/prebuilt/gapps/arm64/priv-app/GoogleFeedback/GoogleFeedback.apk b/prebuilt/gapps/arm64/priv-app/GoogleFeedback/GoogleFeedback.apk deleted file mode 100644 index 7db4ac3..0000000 Binary files a/prebuilt/gapps/arm64/priv-app/GoogleFeedback/GoogleFeedback.apk and /dev/null differ diff --git a/prebuilt/gapps/arm64/priv-app/GoogleLoginService/GoogleLoginService.apk b/prebuilt/gapps/arm64/priv-app/GoogleLoginService/GoogleLoginService.apk deleted file mode 100644 index cd53296..0000000 Binary files a/prebuilt/gapps/arm64/priv-app/GoogleLoginService/GoogleLoginService.apk and /dev/null differ diff --git a/prebuilt/gapps/arm64/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk b/prebuilt/gapps/arm64/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk deleted file mode 100644 index 384e554..0000000 Binary files a/prebuilt/gapps/arm64/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk and /dev/null differ diff --git a/prebuilt/gapps/arm64/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/prebuilt/gapps/arm64/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk deleted file mode 100644 index 2cd71cb..0000000 Binary files a/prebuilt/gapps/arm64/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk and /dev/null differ diff --git a/prebuilt/gapps/arm64/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/prebuilt/gapps/arm64/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk deleted file mode 100644 index f3108bd..0000000 Binary files a/prebuilt/gapps/arm64/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and /dev/null differ diff --git a/prebuilt/gapps/arm64/priv-app/Hotword/Hotword.apk b/prebuilt/gapps/arm64/priv-app/Hotword/Hotword.apk new file mode 100644 index 0000000..306be9c Binary files /dev/null and b/prebuilt/gapps/arm64/priv-app/Hotword/Hotword.apk differ diff --git a/prebuilt/gapps/arm64/priv-app/SetupWizard/SetupWizard.apk b/prebuilt/gapps/arm64/priv-app/SetupWizard/SetupWizard.apk deleted file mode 100644 index 828277b..0000000 Binary files a/prebuilt/gapps/arm64/priv-app/SetupWizard/SetupWizard.apk and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin deleted file mode 100644 index eeb495e..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin deleted file mode 100644 index 8292c58..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin deleted file mode 100644 index 90292d4..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin deleted file mode 100644 index bccd30a..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin deleted file mode 100644 index 343e4ea..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin deleted file mode 100644 index 6708d71..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin deleted file mode 100644 index dbca576..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin deleted file mode 100644 index 5d8f45f..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin deleted file mode 100644 index 997f486..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin and /dev/null differ diff --git a/prebuilt/gapps/arm64/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin b/prebuilt/gapps/arm64/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin deleted file mode 100644 index cf6386c..0000000 Binary files a/prebuilt/gapps/arm64/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin and /dev/null differ diff --git a/prebuilt/gapps/arm/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk b/prebuilt/gapps/common/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk similarity index 100% rename from prebuilt/gapps/arm/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk rename to prebuilt/gapps/common/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk diff --git a/prebuilt/gapps/arm/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/prebuilt/gapps/common/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk similarity index 100% rename from prebuilt/gapps/arm/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk rename to prebuilt/gapps/common/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk diff --git a/prebuilt/gapps/arm/etc/permissions/com.google.android.camera2.xml b/prebuilt/gapps/common/etc/permissions/com.google.android.camera2.xml similarity index 100% rename from prebuilt/gapps/arm/etc/permissions/com.google.android.camera2.xml rename to prebuilt/gapps/common/etc/permissions/com.google.android.camera2.xml diff --git a/prebuilt/gapps/arm/etc/permissions/com.google.android.maps.xml b/prebuilt/gapps/common/etc/permissions/com.google.android.maps.xml similarity index 100% rename from prebuilt/gapps/arm/etc/permissions/com.google.android.maps.xml rename to prebuilt/gapps/common/etc/permissions/com.google.android.maps.xml diff --git a/prebuilt/gapps/arm/etc/permissions/com.google.android.media.effects.xml b/prebuilt/gapps/common/etc/permissions/com.google.android.media.effects.xml similarity index 100% rename from prebuilt/gapps/arm/etc/permissions/com.google.android.media.effects.xml rename to prebuilt/gapps/common/etc/permissions/com.google.android.media.effects.xml diff --git a/prebuilt/gapps/arm/etc/permissions/com.google.widevine.software.drm.xml b/prebuilt/gapps/common/etc/permissions/com.google.widevine.software.drm.xml similarity index 100% rename from prebuilt/gapps/arm/etc/permissions/com.google.widevine.software.drm.xml rename to prebuilt/gapps/common/etc/permissions/com.google.widevine.software.drm.xml diff --git a/prebuilt/gapps/arm/framework/com.google.android.camera2.jar b/prebuilt/gapps/common/framework/com.google.android.camera2.jar similarity index 100% rename from prebuilt/gapps/arm/framework/com.google.android.camera2.jar rename to prebuilt/gapps/common/framework/com.google.android.camera2.jar diff --git a/prebuilt/gapps/arm/framework/com.google.android.maps.jar b/prebuilt/gapps/common/framework/com.google.android.maps.jar similarity index 100% rename from prebuilt/gapps/arm/framework/com.google.android.maps.jar rename to prebuilt/gapps/common/framework/com.google.android.maps.jar diff --git a/prebuilt/gapps/arm/framework/com.google.android.media.effects.jar b/prebuilt/gapps/common/framework/com.google.android.media.effects.jar similarity index 100% rename from prebuilt/gapps/arm/framework/com.google.android.media.effects.jar rename to prebuilt/gapps/common/framework/com.google.android.media.effects.jar diff --git a/prebuilt/gapps/arm/framework/com.google.widevine.software.drm.jar b/prebuilt/gapps/common/framework/com.google.widevine.software.drm.jar similarity index 100% rename from prebuilt/gapps/arm/framework/com.google.widevine.software.drm.jar rename to prebuilt/gapps/common/framework/com.google.widevine.software.drm.jar diff --git a/prebuilt/gapps/arm/faceunlock.sh b/prebuilt/gapps/common/gapps_scripts.sh similarity index 81% rename from prebuilt/gapps/arm/faceunlock.sh rename to prebuilt/gapps/common/gapps_scripts.sh index d1b7dac..8726c93 100644 --- a/prebuilt/gapps/arm/faceunlock.sh +++ b/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 diff --git a/prebuilt/gapps/arm/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk b/prebuilt/gapps/common/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk similarity index 100% rename from prebuilt/gapps/arm/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk rename to prebuilt/gapps/common/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk diff --git a/prebuilt/gapps/arm/priv-app/GoogleFeedback/GoogleFeedback.apk b/prebuilt/gapps/common/priv-app/GoogleFeedback/GoogleFeedback.apk similarity index 100% rename from prebuilt/gapps/arm/priv-app/GoogleFeedback/GoogleFeedback.apk rename to prebuilt/gapps/common/priv-app/GoogleFeedback/GoogleFeedback.apk diff --git a/prebuilt/gapps/arm/priv-app/GoogleLoginService/GoogleLoginService.apk b/prebuilt/gapps/common/priv-app/GoogleLoginService/GoogleLoginService.apk similarity index 100% rename from prebuilt/gapps/arm/priv-app/GoogleLoginService/GoogleLoginService.apk rename to prebuilt/gapps/common/priv-app/GoogleLoginService/GoogleLoginService.apk diff --git a/prebuilt/gapps/arm/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk b/prebuilt/gapps/common/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk similarity index 100% rename from prebuilt/gapps/arm/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk rename to prebuilt/gapps/common/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk diff --git a/prebuilt/gapps/arm/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/prebuilt/gapps/common/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk similarity index 100% rename from prebuilt/gapps/arm/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk rename to prebuilt/gapps/common/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk diff --git a/prebuilt/gapps/arm/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/prebuilt/gapps/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk similarity index 100% rename from prebuilt/gapps/arm/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk rename to prebuilt/gapps/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk diff --git a/prebuilt/gapps/arm/priv-app/Phonesky/Phonesky.apk b/prebuilt/gapps/common/priv-app/Phonesky/Phonesky.apk similarity index 63% rename from prebuilt/gapps/arm/priv-app/Phonesky/Phonesky.apk rename to prebuilt/gapps/common/priv-app/Phonesky/Phonesky.apk index b74ffae..2d03c3a 100644 Binary files a/prebuilt/gapps/arm/priv-app/Phonesky/Phonesky.apk and b/prebuilt/gapps/common/priv-app/Phonesky/Phonesky.apk differ diff --git a/prebuilt/gapps/arm/priv-app/SetupWizard/SetupWizard.apk b/prebuilt/gapps/common/priv-app/SetupWizard/SetupWizard.apk similarity index 100% rename from prebuilt/gapps/arm/priv-app/SetupWizard/SetupWizard.apk rename to prebuilt/gapps/common/priv-app/SetupWizard/SetupWizard.apk diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin b/prebuilt/gapps/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin b/prebuilt/gapps/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin b/prebuilt/gapps/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin b/prebuilt/gapps/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin b/prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin b/prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin b/prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin b/prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin b/prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin diff --git a/prebuilt/gapps/arm/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin b/prebuilt/gapps/common/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin similarity index 100% rename from prebuilt/gapps/arm/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin rename to prebuilt/gapps/common/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin diff --git a/prebuilt/gapps/x86/addon.d/30-gapps.sh b/prebuilt/gapps/x86/addon.d/30-gapps.sh new file mode 100644 index 0000000..2dc75b0 --- /dev/null +++ b/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 <