Full, microG packages: new setup variable nanodroid_gmscore

ChangeLog.md

@@ -24,6 +24,12 @@
      * file list of /system/app and /system/priv-app
   * log is created in /sdcard/NanoDroid-SysTest.log
 
+* Full, microG packages
+  * new setup variable `nanodroid_gmscore`, selects which microG GmsCore to install
+     * 0 = install NanoDroid's [custom microG GmsCore](https://github.com/Nanolx/android_packages_apps_GmsCore)
+     * 1 = install [official microG GmsCore](https://github.com/microg/android_packages_apps_GmsCore)
+  
+
 * CommonInstaller
   * NanoDroid installation log now contains whether install was successful or not
   * Installer now prints a message where it stored the logs

CommonInstaller

@@ -695,10 +695,15 @@ install_microg () {
 			    ui_print " << with microG [Déjà Vu, Ichnaea, Nominatim]" ;;
 		esac
 
-		for app in ${NLPBACKEND} nlpBackendNominatim GmsCore; do
+		for app in ${NLPBACKEND} nlpBackendNominatim; do
 			nanodroid_install_apk ${app}
 		done
 
+		if [ "${nanodroid_gmscore}" -eq 0 ]; then
+			nanodroid_install_apk GmsCore_NanoDroid "" GmsCore
+		else	nanodroid_install_apk GmsCore_Official "" GmsCore
+		fi
+
 		if [ "${nanodroid_microg}" -ne 2 ]; then
 			for app in GsfProxy DroidGuard; do
 				nanodroid_install_apk ${app}
@@ -1324,6 +1329,7 @@ check_cfg_setup () {
 
 	[ -z "${nanodroid_fdroid}" ] && set_prop nanodroid_fdroid 1
 	[ -z "${nanodroid_microg}" ] && set_prop nanodroid_microg 1
+	[ -z "${nanodroid_gmscore}" ] && set_prop nanodroid_gmscore 0
 	[ -z "${nanodroid_apps}" ] && set_prop nanodroid_apps 1
 	[ -z "${nanodroid_play}" ] && set_prop nanodroid_play 1
 

data/build-package.database

@@ -4,7 +4,7 @@
 # NanoDroid self-provided apks
 ###
 
-nlx_GMSCORE=(nanolx com.google.android.gms priv-app GmsCore)
+nlx_GMSCORE=(nanolx com.google.android.gms priv-app GmsCore_NanoDroid)
 nlx_DROIDGUARD=(nanolx org.microg.gms.droidguard priv-app DroidGuard)
 nlx_MPV=(nanolx is.xyz.mpv app MPV)
 nlx_PHONESKY=(nanolx com.android.vending priv-app Phonesky)
@@ -17,7 +17,7 @@ nlx_OMNICLOCK=(https://www.nanolx.org/apk/OmniClock.apk app OmniClock)
 # microG
 ###
 
-uG_GMSCORE=(microg com.google.android.gms priv-app GmsCore)
+uG_GMSCORE=(microg com.google.android.gms priv-app GmsCore_Official)
 uG_GSFPROXY=(microg com.google.android.gsf priv-app GsfProxy)
 uG_DROIDGUARD=(microg org.microg.gms.droidguard priv-app DroidGuard)
 uG_FAKESTORE=(microg com.android.vending priv-app FakeStore)
@@ -169,6 +169,8 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/system/priv-app/FakeStore/FakeStore.apk
 	Full/system/priv-app/YalpStore/YalpStore.apk
 	Full/system/priv-app/GsfProxy/GsfProxy.apk
+	Full/system/priv-app/GmsCore_NanoDroid/GmsCore_NanoDroid.apk
+	Full/system/priv-app/GmsCore_Official/GmsCore_Official.apk
 	BromiteWebView/system/app/BromiteWebView_arm/BromiteWebView_arm.apk
 	BromiteWebView/system/app/BromiteWebView_arm64/BromiteWebView_arm64.apk
 	BromiteWebView/system/app/BromiteWebView_x86/BromiteWebView_x86.apk )

data/build-package.update

@@ -26,6 +26,7 @@ update_swipe () {
 
 update_microg () {
 	grab_apk_from_repo ${nlx_GMSCORE[@]}
+	grab_apk_from_repo ${uG_GMSCORE[@]}
 	grab_apk_from_repo ${uG_GSFPROXY[@]}
 	grab_apk_from_repo ${nlx_DROIDGUARD[@]}
 	grab_apk_from_repo ${uG_FAKESTORE[@]}

doc/AlterInstallation.md

@@ -17,6 +17,7 @@ create it manually with the following content for the **full** package
 
 ```
 nanodroid_microg=1
+nanodroid_gmscore=0
 nanodroid_fdroid=1
 nanodroid_apps=1
 nanodroid_play=1
@@ -35,9 +36,10 @@ nanodroid_fonts=1
 nanodroid_override=0
 ```
 
-the **microG** package supports the following options
+the **microG** package supports the following options (nanodroid_microg is always 1)
 
 ```
+nanodroid_gmscore=0
 nanodroid_play=1
 nanodroid_overlay=0
 nanodroid_mapsv1=1
@@ -47,7 +49,7 @@ nanodroid_forcesystem=0
 nanodroid_nlpbackend=1
 ```
 
-the **F-Droid** and **Bromite WebView** pckage supports the following options
+the **F-Droid** (nanodroid_fdroid is always 1) and **Bromite WebView** pckage supports the following options
 
 ```
 nanodroid_forcesystem=0
@@ -70,6 +72,13 @@ whether to provide **microG**
       * without Push Messaging support through GCM
       * without the ability to pass SafetyNet attestation
 
+`nanodroid_gmscore=[0|1]`
+
+which microG GmsCore to install
+
+* 0 = install NanoDroid's [custom microG GmsCore](https://github.com/Nanolx/android_packages_apps_GmsCore)
+* 1 = install [official microG GmsCore](https://github.com/microg/android_packages_apps_GmsCore)
+
 `nanodroid_fdroid=[0|1]`
 
 whether to provide **F-Droid**