Rengerate makefiles

arm64/Android.bp

@@ -6,9 +6,21 @@ soong_namespace {
 }
 
 android_app_import {
-	name: "PrebuiltGmsCore",
+	name: "GmsCore",
 	owner: "gapps",
-	apk: "proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk",
+	apk: "proprietary/product/priv-app/GmsCore/GmsCore.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "Phonesky",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/Phonesky/Phonesky.apk",
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
@@ -51,10 +63,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "SetupWizardPrebuilt",
+	name: "SetupWizard",
 	owner: "gapps",
-	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
-	overrides: ["Provision"],
+	apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
 	presigned: true,
 	dex_preopt: {
 		enabled: false,

arm64/arm64-vendor.mk

@@ -10,7 +10,8 @@ PRODUCT_COPY_FILES += \
     vendor/gapps/arm64/proprietary/product/lib64/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
-    PrebuiltGmsCore
+    GmsCore \
+    Phonesky
 
 ifeq ($(TARGET_IS_GROUPER),)
 PRODUCT_COPY_FILES += \
@@ -20,7 +21,7 @@ PRODUCT_PACKAGES += \
     GoogleTTS \
     MarkupGoogle \
     talkback \
-    SetupWizardPrebuilt \
+    SetupWizard \
     Velvet
 endif