android/vendor_gapps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move SetupWizard to system_ext

Browse Source 
* This is where it's supposed to be
This commit is contained in:
Paul Keith 2021-11-16 12:52:24 -06:00
parent 64fe7f9c11
commit 65ac6290d1
16 changed files with 68 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arm/Android.bp
View File

@ -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,
}

4
arm/arm-vendor.mk
View File

@ -20,8 +20,8 @@ PRODUCT_PACKAGES += \
GoogleTTS \
MarkupGoogle \
talkback \
SetupWizard \
Velvet
Velvet \
SetupWizard
endif
$(call inherit-product, vendor/gapps/common/common-vendor.mk)

0
arm/proprietary/product/priv-app/SetupWizard/SetupWizard.apk → arm/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk
View File

26
arm64/Android.bp
View File

@ -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,
}

4
arm64/arm64-vendor.mk
View File

@ -21,8 +21,8 @@ PRODUCT_PACKAGES += \
GoogleTTS \
MarkupGoogle \
talkback \
SetupWizard \
Velvet
Velvet \
SetupWizard
endif
$(call inherit-product, vendor/gapps/common/common-vendor.mk)

0
arm64/proprietary/product/priv-app/SetupWizard/SetupWizard.apk → arm64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk
View File

3
proprietary-files-arm-nongrouper.txt
View File

@ -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

3
proprietary-files-arm64-nongrouper.txt
View File

@ -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

3
proprietary-files-x86-nongrouper.txt
View File

@ -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

3
proprietary-files-x86_64-nongrouper.txt
View File

@ -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

26
x86/Android.bp
View File

@ -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,
}

0
x86/proprietary/product/priv-app/SetupWizard/SetupWizard.apk → x86/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk
View File

4
x86/x86-vendor.mk
View File

@ -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)

26
x86_64/Android.bp
View File

@ -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,
}

0
x86_64/proprietary/product/priv-app/SetupWizard/SetupWizard.apk → x86_64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk
View File

4
x86_64/x86_64-vendor.mk
View File

@ -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)