From 65ac6290d16b4a1380a09f93a6d93d7ddefb7869 Mon Sep 17 00:00:00 2001 From: Paul Keith Date: Tue, 16 Nov 2021 12:52:24 -0600 Subject: [PATCH] Move SetupWizard to system_ext * This is where it's supposed to be --- arm/Android.bp | 26 +++++++++--------- arm/arm-vendor.mk | 4 +-- .../priv-app/SetupWizard/SetupWizard.apk | Bin arm64/Android.bp | 26 +++++++++--------- arm64/arm64-vendor.mk | 4 +-- .../priv-app/SetupWizard/SetupWizard.apk | Bin proprietary-files-arm-nongrouper.txt | 3 +- proprietary-files-arm64-nongrouper.txt | 3 +- proprietary-files-x86-nongrouper.txt | 3 +- proprietary-files-x86_64-nongrouper.txt | 3 +- x86/Android.bp | 26 +++++++++--------- .../priv-app/SetupWizard/SetupWizard.apk | Bin x86/x86-vendor.mk | 4 +-- x86_64/Android.bp | 26 +++++++++--------- .../priv-app/SetupWizard/SetupWizard.apk | Bin x86_64/x86_64-vendor.mk | 4 +-- 16 files changed, 68 insertions(+), 64 deletions(-) rename arm/proprietary/{product => system_ext}/priv-app/SetupWizard/SetupWizard.apk (100%) rename arm64/proprietary/{product => system_ext}/priv-app/SetupWizard/SetupWizard.apk (100%) rename x86/proprietary/{product => system_ext}/priv-app/SetupWizard/SetupWizard.apk (100%) rename x86_64/proprietary/{product => system_ext}/priv-app/SetupWizard/SetupWizard.apk (100%) diff --git a/arm/Android.bp b/arm/Android.bp index acfcd55..9a15b26 100644 --- a/arm/Android.bp +++ b/arm/Android.bp @@ -62,19 +62,6 @@ android_app_import { product_specific: true, } -android_app_import { - name: "SetupWizard", - owner: "gapps", - apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk", - overrides: ["Provision"], - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - android_app_import { name: "Velvet", owner: "gapps", @@ -87,3 +74,16 @@ android_app_import { product_specific: true, } +android_app_import { + name: "SetupWizard", + owner: "gapps", + apk: "proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk", + overrides: ["Provision"], + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk index 9a5d851..3a6e727 100644 --- a/arm/arm-vendor.mk +++ b/arm/arm-vendor.mk @@ -20,8 +20,8 @@ PRODUCT_PACKAGES += \ GoogleTTS \ MarkupGoogle \ talkback \ - SetupWizard \ - Velvet + Velvet \ + SetupWizard endif $(call inherit-product, vendor/gapps/common/common-vendor.mk) diff --git a/arm/proprietary/product/priv-app/SetupWizard/SetupWizard.apk b/arm/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk similarity index 100% rename from arm/proprietary/product/priv-app/SetupWizard/SetupWizard.apk rename to arm/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk diff --git a/arm64/Android.bp b/arm64/Android.bp index 4a526bc..1996186 100644 --- a/arm64/Android.bp +++ b/arm64/Android.bp @@ -62,19 +62,6 @@ android_app_import { product_specific: true, } -android_app_import { - name: "SetupWizard", - owner: "gapps", - apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk", - overrides: ["Provision"], - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - android_app_import { name: "Velvet", owner: "gapps", @@ -87,3 +74,16 @@ android_app_import { product_specific: true, } +android_app_import { + name: "SetupWizard", + owner: "gapps", + apk: "proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk", + overrides: ["Provision"], + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk index 2976e12..b4fed78 100644 --- a/arm64/arm64-vendor.mk +++ b/arm64/arm64-vendor.mk @@ -21,8 +21,8 @@ PRODUCT_PACKAGES += \ GoogleTTS \ MarkupGoogle \ talkback \ - SetupWizard \ - Velvet + Velvet \ + SetupWizard endif $(call inherit-product, vendor/gapps/common/common-vendor.mk) diff --git a/arm64/proprietary/product/priv-app/SetupWizard/SetupWizard.apk b/arm64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk similarity index 100% rename from arm64/proprietary/product/priv-app/SetupWizard/SetupWizard.apk rename to arm64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt index 08b2985..8ac7196 100644 --- a/proprietary-files-arm-nongrouper.txt +++ b/proprietary-files-arm-nongrouper.txt @@ -1,6 +1,7 @@ -product/app/GoogleTTS/GoogleTTS.apk;PRESIGNED|a683e05e6ed20c293c73e8e745253c6c89adf955 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f -product/app/talkback/talkback.apk;PRESIGNED|be748ca431a2d8ceeafa3e324fe98a4454eebeb8 --product/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|52d65ce2850c8d29435fb18a60d3ff1f16d38461 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|bd42dd08db4d31e09be910544d7570993c2f560c product/app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db + +-system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|52d65ce2850c8d29435fb18a60d3ff1f16d38461 diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt index 9a35b92..1097c3b 100644 --- a/proprietary-files-arm64-nongrouper.txt +++ b/proprietary-files-arm64-nongrouper.txt @@ -1,6 +1,7 @@ -product/app/GoogleTTS/GoogleTTS.apk;PRESIGNED|89f25ee81c8bd93b8a788fa2b4a7c56d8ecfad92 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f -product/app/talkback/talkback.apk;PRESIGNED|3919b84d1975ee664289beb8a0d683fa312ed5a0 --product/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|691e4c76521fa0e47005c37d0b70094a74a855f3 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|2afe5f811617cd293d24478f8702b6ab4b99251c product/app/MarkupGoogle/lib/arm64/libsketchology_native.so|5c55b4d32beeeca04b4e9f4ce1a2cd3e15a32c8c + +-system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|691e4c76521fa0e47005c37d0b70094a74a855f3 diff --git a/proprietary-files-x86-nongrouper.txt b/proprietary-files-x86-nongrouper.txt index 6469272..d14c266 100644 --- a/proprietary-files-x86-nongrouper.txt +++ b/proprietary-files-x86-nongrouper.txt @@ -1,2 +1,3 @@ --product/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|cae5849fdd55cf7ef4a7fde1a180ab8fb2cf8dfd -product/priv-app/Velvet/Velvet.apk;PRESIGNED|131f57f1c772e1c08078e161e6ba5a7f79ed022f + +-system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|cae5849fdd55cf7ef4a7fde1a180ab8fb2cf8dfd diff --git a/proprietary-files-x86_64-nongrouper.txt b/proprietary-files-x86_64-nongrouper.txt index b40f7af..b0bf6cb 100644 --- a/proprietary-files-x86_64-nongrouper.txt +++ b/proprietary-files-x86_64-nongrouper.txt @@ -1,2 +1,3 @@ --product/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|ef984a31dfe60c86b7c833835b71f62505582fb3 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|f42b6c8809feb12f0a435737258bc63feccfd3ce + +-system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|ef984a31dfe60c86b7c833835b71f62505582fb3 diff --git a/x86/Android.bp b/x86/Android.bp index 78234c5..7ddee60 100644 --- a/x86/Android.bp +++ b/x86/Android.bp @@ -29,19 +29,6 @@ android_app_import { product_specific: true, } -android_app_import { - name: "SetupWizard", - owner: "gapps", - apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk", - overrides: ["Provision"], - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - android_app_import { name: "Velvet", owner: "gapps", @@ -54,3 +41,16 @@ android_app_import { product_specific: true, } +android_app_import { + name: "SetupWizard", + owner: "gapps", + apk: "proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk", + overrides: ["Provision"], + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + diff --git a/x86/proprietary/product/priv-app/SetupWizard/SetupWizard.apk b/x86/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk similarity index 100% rename from x86/proprietary/product/priv-app/SetupWizard/SetupWizard.apk rename to x86/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk index d960e54..3e7a69a 100644 --- a/x86/x86-vendor.mk +++ b/x86/x86-vendor.mk @@ -15,8 +15,8 @@ PRODUCT_PACKAGES += \ ifeq ($(TARGET_IS_GROUPER),) PRODUCT_PACKAGES += \ - SetupWizard \ - Velvet + Velvet \ + SetupWizard endif $(call inherit-product, vendor/gapps/common/common-vendor.mk) diff --git a/x86_64/Android.bp b/x86_64/Android.bp index 83dc8c7..632389b 100644 --- a/x86_64/Android.bp +++ b/x86_64/Android.bp @@ -29,19 +29,6 @@ android_app_import { product_specific: true, } -android_app_import { - name: "SetupWizard", - owner: "gapps", - apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk", - overrides: ["Provision"], - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - android_app_import { name: "Velvet", owner: "gapps", @@ -54,3 +41,16 @@ android_app_import { product_specific: true, } +android_app_import { + name: "SetupWizard", + owner: "gapps", + apk: "proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk", + overrides: ["Provision"], + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + diff --git a/x86_64/proprietary/product/priv-app/SetupWizard/SetupWizard.apk b/x86_64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk similarity index 100% rename from x86_64/proprietary/product/priv-app/SetupWizard/SetupWizard.apk rename to x86_64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk diff --git a/x86_64/x86_64-vendor.mk b/x86_64/x86_64-vendor.mk index 2e41387..4e3966e 100644 --- a/x86_64/x86_64-vendor.mk +++ b/x86_64/x86_64-vendor.mk @@ -16,8 +16,8 @@ PRODUCT_PACKAGES += \ ifeq ($(TARGET_IS_GROUPER),) PRODUCT_PACKAGES += \ - SetupWizard \ - Velvet + Velvet \ + SetupWizard endif $(call inherit-product, vendor/gapps/common/common-vendor.mk)