15.05 Update

- Make for different platforms (arm, arm64, x86)
- Add arm64 support
- Update GNow
- Fix FaceUnlock FC

README.md

@@ -9,7 +9,13 @@ 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.
+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
@@ -21,10 +27,16 @@ https://github.com/linuxxxxx/vendor_google/releases
 Build
 -------------------
 
-You can compile your GApps package with GNU make (realpath also needed)
+You can compile your GApps package with GNU make
 
 _make distclean_
 - Remove output directory
 
 _make gapps_
-- compile flashable GApps package for most of devices
+- compile signed flashable GApps for arm
+
+_make gapps_arm64_
+- compile signed flashable GApps for arm64
+
+_make gapps_x86_
+- compila signed flashable GApps for x86 (NOT supported atm)

build/gapps.sh

@@ -8,12 +8,9 @@
 DATE=$(date +%F-%H-%M-%S)
 TOP=$(realpath .)
 ANDROIDV=5.1
-BUILDZIP=gapps-$ANDROIDV-$DATE.zip
 OUT=$TOP/out
-TARGETZIP=$OUT/target-zip
-METAINF=$TOP/build/meta
-PREBUILTGAPPS=$TOP/prebuilt/gapps
-
+BUILD=$TOP/build
+METAINF=$BUILD/meta
 
 ##
 # functions
@@ -27,32 +24,31 @@ function printdone(){
 }
 
 function create(){
-    if [ -d $PREBUILTGAPPS ]; then
-        if [ -d $OUT ]; then
-            echo "Previous build found"
-        else
-            echo "No previous build found"
-            mkdir $OUT
-            mkdir $TARGETZIP
-            mkdir $TARGETZIP/tmp
-        fi
-        echo "Getting prebuilts..."
-        cp -r $PREBUILTGAPPS $TARGETZIP/gapps
-        return 0
+    PREBUILT=$TOP/prebuilt/gapps/$GARCH
+    if [ -d $OUT/$GARCH ]; then
+        echo "Previous build found for $GARCH"
     else
-        printerr "Couldn't find prebuilts, sync again"
-        return 1
+        echo "No previous build found for $GARCH"
+        mkdir $OUT
+        TARGET=$OUT/$GARCH
+        mkdir $TARGET
+        mkdir $TARGET/tmp
     fi
+    echo "Getting prebuilts..."
+    cp -r $PREBUILT $TARGET/gapps
+    return $?
 }
 
 function zipit(){
     if [ "$LASTRETURN" == 0 ]; then
+        BUILDZIP=gapps-$ANDROIDV-$GARCH-$DATE.zip
         echo "Importing installation scripts..."
-        cp -r $TARGETZIP/gapps $TARGETZIP/tmp/system
-        cp -r $METAINF $TARGETZIP/tmp/META-INF
+        cp -r $TARGET/gapps $TARGET/tmp/system
+        cp -r $METAINF $TARGET/tmp/META-INF
         echo "Creating package..."
-        cd $TARGETZIP/tmp
+        cd $TARGET/tmp
         zip -r /tmp/$BUILDZIP . &>/dev/null
+        rm -rf $TARGET/tmp
         cd $TOP
         if [ -f /tmp/$BUILDZIP ]; then
             echo "Signing zip..."
@@ -75,6 +71,7 @@ function zipit(){
 ##
 # main
 #
+GARCH=$1
 create
 LASTRETURN=$?
 zipit

build/main.mk

@@ -10,5 +10,13 @@ distclean :
 	@echo "$(tput setaf 2)Output removed! Ready for a clean build$(tput sgr 0)"
 
 gapps :
-	@echo "Compiling GApps..."
-	@bash $(BUILD_GAPPS) 2>&1 | tee $(LOG_BUILD)
+	@echo "Compiling GApps for arm..."
+	@bash $(BUILD_GAPPS) arm 2>&1 | tee $(LOG_BUILD)
+
+gapps_arm64 :
+	@echo "Compiling GApps for arm64..."
+	@bash $(BUILD_GAPPS) arm64 2>&1 | tee $(LOG_BUILD)
+
+gapps_x86 :
+	@echo "Compiling GApps for arm64..."
+	@bash $(BUILD_GAPPS) x86 2>&1 | tee $(LOG_BUILD)