15.06 Update:

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

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

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

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"

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)

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");