SetupWizard is arch dependent

arm/Android.bp

@@ -42,6 +42,19 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",

arm/arm-vendor.mk

@@ -29,6 +29,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     MarkupGoogle \
+    SetupWizardPrebuilt \
     Velvet
 endif
 

arm64/Android.bp

@@ -42,6 +42,19 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",

arm64/arm64-vendor.mk

@@ -30,6 +30,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     MarkupGoogle \
+    SetupWizardPrebuilt \
     Velvet
 endif
 

common/Android.bp

@@ -131,16 +131,3 @@ android_app_import {
 	product_specific: true,
 }
 
-android_app_import {
-	name: "SetupWizardPrebuilt",
-	owner: "gapps",
-	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
-	overrides: ["Provision"],
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	product_specific: true,
-}
-

common/common-vendor.mk

@@ -39,6 +39,5 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
-    AndroidMigratePrebuilt \
-    SetupWizardPrebuilt
+    AndroidMigratePrebuilt
 endif

proprietary-files-arm-nongrouper.txt

@@ -1,3 +1,4 @@
 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|77dbc6656fc920e0d89b9ac8cffdd60250a45ff0
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|29900224869ef94c1fffa1cab31bc8260d86a736
 product/app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db

proprietary-files-arm64-nongrouper.txt

@@ -1,3 +1,4 @@
 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|074346bfb2128d64049b373e447837a300a4054f
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|d6321f135f7f0f503d37bb1ee3f8c1dbae6d2b9c
 product/app/MarkupGoogle/lib/arm64/libsketchology_native.so|5c55b4d32beeeca04b4e9f4ce1a2cd3e15a32c8c

proprietary-files-common-nongrouper.txt

@@ -1,2 +1 @@
 -product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc
--product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED

proprietary-files-x86-nongrouper.txt

@@ -1 +1,2 @@
+-product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|3deb4081593c68ad034b3b8399b3dc8a7e8c4b12
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|09bd04fac0b341bfcad00778438f1cee652dc5ee

setup-makefiles.sh

@@ -53,9 +53,6 @@ echo "endif" >> "$PRODUCTMK"
 
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 
-# Make Google SuW override Provision
-sed -i 's/\(SetupWizardPrebuilt.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP"
-
 # We are done with common
 write_footers
 
@@ -79,6 +76,9 @@ printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)"
 
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 
+# Make Google SuW override Provision
+sed -i 's/\(SetupWizardPrebuilt.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP"
+
 # We are done with target
 write_footers
 

x86/Android.bp

@@ -31,6 +31,19 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",

x86/x86-vendor.mk

@@ -26,6 +26,7 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
+    SetupWizardPrebuilt \
     Velvet
 endif