From d0ec58570c8cb16001b1224209b79e712cbc64e7 Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@gmail.com>
Date: Fri, 8 Oct 2021 12:43:33 -0500
Subject: [PATCH] Make SetupWizard override Provision again

---
 arm/Android.bp     | 1 +
 arm64/Android.bp   | 1 +
 setup-makefiles.sh | 2 +-
 x86/Android.bp     | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arm/Android.bp b/arm/Android.bp
index c42c982..acfcd55 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -66,6 +66,7 @@ android_app_import {
 	name: "SetupWizard",
 	owner: "gapps",
 	apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
+	overrides: ["Provision"],
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
diff --git a/arm64/Android.bp b/arm64/Android.bp
index e648e1b..4a526bc 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -66,6 +66,7 @@ android_app_import {
 	name: "SetupWizard",
 	owner: "gapps",
 	apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
+	overrides: ["Provision"],
 	presigned: true,
 	dex_preopt: {
 		enabled: false,
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 792db97..2cb7d93 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -75,7 +75,7 @@ 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"
+sed -i 's/\(SetupWizard.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP"
 
 # We are done with target
 write_footers
diff --git a/x86/Android.bp b/x86/Android.bp
index 9f0d56f..78234c5 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -33,6 +33,7 @@ android_app_import {
 	name: "SetupWizard",
 	owner: "gapps",
 	apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
+	overrides: ["Provision"],
 	presigned: true,
 	dex_preopt: {
 		enabled: false,