15.07 Update:

- Fix removal of faceunlock (@ShevT > 1d4f9afc144843459a2f7c19d269996c688874aa)
- Fix typo in addon.d script
- Add md5 calculation (based on @pete4abw > ae166a10ad8c683182a1cd437242520254e40684)
- Improve log content (aka make it useful)

Signed-off-by: jrizzoli <[email protected]>

build/gapps.sh

@@ -12,6 +12,7 @@ OUT=$TOP/out
 BUILD=$TOP/build
 METAINF=$BUILD/meta
 COMMON=$TOP/prebuilt/gapps/common
+GLOG=/tmp/gapps_log
 
 ##
 # functions
@@ -25,47 +26,62 @@ function printdone(){
 }
 
 function create(){
+    if [ -f $GLOG ]; then
+        rm -f $GLOG
+    fi
+    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!"
+        echo "Previous build found for $GARCH!" >> $GLOG
     else
-        echo "No previous build found for $GARCH!"
-        mkdir $OUT
-        mkdir $OUT/$GARCH
+        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
     echo "Getting prebuilts..."
-    cp -r $PREBUILT $OUT/$GARCH
-    mv $OUT/$GARCH/$GARCH $OUT/$GARCH/arch
-    cp -r $COMMON $OUT/$GARCH
+    echo "Copying stuffs" >> $GLOG
+    cp -r $PREBUILT $OUT/$GARCH >> $GLOG
+    mv $OUT/$GARCH/$GARCH $OUT/$GARCH/arch >> $GLOG
+    cp -r $COMMON $OUT/$GARCH >> $GLOG
 }
 
 function zipit(){
-    if [ "$LASTRETURN" == 0 ]; then
-        BUILDZIP=gapps-$ANDROIDV-$DATE.zip
-        echo "Importing installation scripts..."
-        cp -r $METAINF $OUT/$GARCH/META-INF
-        echo "Creating package..."
-        cd $OUT/$GARCH
-        zip -r /tmp/$BUILDZIP . &>/dev/null
-        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/$GARCH/$BUILDZIP
-        else
-            printerr "Couldn't zip files!"
-            return 1
-        fi
-        if [ "$?" == 0 ]; then
-            return 0
-        else
-            return 1
-        fi
+    BUILDZIP=gapps-$ANDROIDV-$DATE.zip
+    echo "Importing installation scripts..."
+    cp -r $METAINF $OUT/$GARCH/META-INF && echo "Meta copied" >> $GLOG
+    echo "Creating package..."
+    cd $OUT/$GARCH
+    zip -r /tmp/$BUILDZIP . >> $GLOG
+    rm -rf $OUT/tmp >> $GLOG
+    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
     else
+        printerr "Couldn't zip files!"
+        echo "Couldn't find unsigned zip file, aborting" >> $GLOG
         return 1
     fi
 }
 
+function getmd5(){
+    if [ -x $(which md5sum) ]; then
+        echo "md5sum is installed, getting md5..." >> $GLOG
+        echo "Getting md5sum..."
+        GMD5=$(md5sum $OUT/$GARCH/$BUILDZIP)
+        return 0
+    else
+        echo "md5sum is not installed, aborting" >> $GLOG
+        return 1
+    fi
+}
 
 ##
 # main
@@ -73,12 +89,26 @@ function zipit(){
 GARCH=$1
 create
 LASTRETURN=$?
-zipit
-LASTRETURN=$?
 if [ "$LASTRETURN" == 0 ]; then
-    printdone "Build completed: $OUT/$GARCH/$BUILDZIP"
-    exit 0
+    zipit
+    LASTRETURN=$?
+    if [ "$LASTRETURN" == 0 ]; then
+        getmd5
+        LASTRETURN=$?
+        if [ "$LASTRETURN" == 0 ]; then
+            echo "Done!" >> $GLOG
+            printdone "Build completed: $OUT/$GARCH/$BUILDZIP"
+            printdone "            md5: $GMD5"
+            exit 0
+        else
+            printerr "Build failed, check $GLOG"
+            exit 1
+        fi
+    else
+        printerr "Build failed, check $GLOG"
+        exit 1
+    fi
 else
-    printerr "Build failed, check /tmp/gapps_log"
+    printerr "Build failed, check $GLOG"
     exit 1
 fi

build/main.mk

@@ -11,12 +11,12 @@ distclean :
 
 arm :
 	@echo "Compiling GApps for arm..."
-	@bash $(BUILD_GAPPS) arm 2>&1 | tee $(LOG_BUILD)
+	@bash $(BUILD_GAPPS) arm 2>&1
 
 arm64 :
 	@echo "Compiling GApps for arm64..."
-	@bash $(BUILD_GAPPS) arm64 2>&1 | tee $(LOG_BUILD)
+	@bash $(BUILD_GAPPS) arm64 2>&1
 
 x86 :
 	@echo "Compiling GApps for x86..."
-	@bash $(BUILD_GAPPS) x86 2>&1 | tee $(LOG_BUILD)
+	@bash $(BUILD_GAPPS) x86 2>&1

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

@@ -29,7 +29,7 @@ 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/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

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

@@ -31,7 +31,7 @@ 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/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

prebuilt/gapps/common/gapps_scripts.sh

@@ -21,7 +21,7 @@ if good_ffc_device && [ -e /system/etc/permissions/android.hardware.camera.front
   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 -rf /system/app/FaceLock/
   rm  -f /system/lib/libfacelock_jni.so
   rm  -f /system/addon.d/31-faceunlock.sh
 fi

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

@@ -29,7 +29,7 @@ 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/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