From 0d036860d4fd6738ba023737488a8e7edcc15eb7 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Sat, 6 Jul 2019 20:32:06 +0200
Subject: [PATCH] update SetupWizard

---
 setup-wizard/META-INF/com/google/android/aroma-config | 11 -----------
 setup-wizard/nanodroid-setup                          |  9 ---------
 2 files changed, 20 deletions(-)

diff --git a/setup-wizard/META-INF/com/google/android/aroma-config b/setup-wizard/META-INF/com/google/android/aroma-config
index 0aa914b..a022bed 100644
--- a/setup-wizard/META-INF/com/google/android/aroma-config
+++ b/setup-wizard/META-INF/com/google/android/aroma-config
@@ -75,17 +75,6 @@ selectbox(
 	"Minimal",	"Install microG [GmsCore, Nominatim]",					0	#-- selected.1 = 3
 );
 
-selectbox(
-	"microG GmsCore",
-	"microG GmsCore",
-	"@customize",
-	"gmscore.prop",
-
-	"Select which microG GmsCore to install (if any)", "", 2, #-- Group 1. key = "selected.1"
-	"NanoDroid",	"custom NanoDroid microG GmsCore with beta state code merged",	0,	#-- selected.1 = 1
-	"Official",	"official microG GmsCore",					1	#-- selected.1 = 2
-);
-
 checkbox(
 	"nlpBackends",
 	"nlpBackends",
diff --git a/setup-wizard/nanodroid-setup b/setup-wizard/nanodroid-setup
index b613e8b..94c90e8 100644
--- a/setup-wizard/nanodroid-setup
+++ b/setup-wizard/nanodroid-setup
@@ -50,7 +50,6 @@ debloat_prop="${aromapath}/debloat.prop"
 location_prop="${aromapath}/location.prop"
 nlp_prop="${aromapath}/nlp.prop"
 ug_prop="${aromapath}/ug.prop"
-gmscore_prop="${aromapath}/gmscore.prop"
 
 ui_print " "
 ui_print "****************************"
@@ -170,14 +169,6 @@ elif grep -q "selected.1=3" "${ug_prop}"; then
 	echo "nanodroid_microg=2" >> "${nanodroid_setup}"
 fi
 
-if grep -q "selected.1=1" "${gmscore_prop}"; then
-	ui_print "  <>> setting property: nanodroid_gmscore [custom]"
-	echo "nanodroid_gmscore=0" >> "${nanodroid_setup}"
-elif grep -q "selected.1=2" "${gmscore_prop}"; then
-	ui_print "  <>> setting property: nanodroid_gmscore [official]"
-	echo "nanodroid_gmscore=1" >> "${nanodroid_setup}"
-fi
-
 ui_print " "
 ui_print " < Installed Applications"