Rengerate makefiles

This commit is contained in:
Paul Keith 2021-10-08 12:42:47 -05:00
parent 259673442b
commit de412da335
8 changed files with 67 additions and 43 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -39,9 +39,9 @@ android_app_import {
}
android_app_import {
name: "AndroidAutoStubPrebuilt",
name: "AndroidAutoStub",
owner: "gapps",
apk: "proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk",
apk: "proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk",
presigned: true,
dex_preopt: {
enabled: false,
@ -51,21 +51,9 @@ android_app_import {
}
android_app_import {
name: "PartnerSetupPrebuilt",
name: "GooglePartnerSetup",
owner: "gapps",
apk: "proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.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",
apk: "proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk",
presigned: true,
dex_preopt: {
enabled: false,

View File

@ -7,19 +7,19 @@ PRODUCT_SOONG_NAMESPACES += \
PRODUCT_COPY_FILES += \
vendor/gapps/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.google.android.dialer.support.xml \
vendor/gapps/common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-google-p.xml \
vendor/gapps/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google-hiddenapi-package-whitelist.xml \
vendor/gapps/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-google-product.xml \
vendor/gapps/common/proprietary/product/etc/sysconfig/d2d_cable_migration_feature.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/d2d_cable_migration_feature.xml \
vendor/gapps/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google-hiddenapi-package-allowlist.xml \
vendor/gapps/common/proprietary/product/etc/sysconfig/google.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google.xml \
vendor/gapps/common/proprietary/product/etc/sysconfig/google_build.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google_build.xml \
vendor/gapps/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-google-se.xml
vendor/gapps/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-google-system-ext.xml
PRODUCT_PACKAGES += \
GoogleCalendarSyncAdapter \
GoogleContactsSyncAdapter \
PrebuiltExchange3Google \
AndroidAutoStubPrebuilt \
PartnerSetupPrebuilt \
Phonesky \
AndroidAutoStub \
GooglePartnerSetup \
GoogleFeedback \
GoogleServicesFramework \
com.google.android.dialer.support

View File

@ -6,9 +6,9 @@ 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,
@ -18,10 +18,21 @@ android_app_import {
}
android_app_import {
name: "SetupWizardPrebuilt",
name: "Phonesky",
owner: "gapps",
apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
overrides: ["Provision"],
apk: "proprietary/product/priv-app/Phonesky/Phonesky.apk",
presigned: true,
dex_preopt: {
enabled: false,
},
privileged: true,
product_specific: true,
}
android_app_import {
name: "SetupWizard",
owner: "gapps",
apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
presigned: true,
dex_preopt: {
enabled: false,

View File

@ -9,12 +9,13 @@ PRODUCT_COPY_FILES += \
vendor/gapps/x86/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so
PRODUCT_PACKAGES += \
PrebuiltGmsCore
GmsCore \
Phonesky
ifeq ($(TARGET_IS_GROUPER),)
PRODUCT_PACKAGES += \
SetupWizardPrebuilt \
SetupWizard \
Velvet
endif