diff --git a/apps/Android.mk b/apps/Android.mk index e6b1bb4..b4cd8d0 100644 --- a/apps/Android.mk +++ b/apps/Android.mk @@ -1,31 +1,5 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := DeviceIntelligenceNetworkPrebuilt2021 -LOCAL_MODULE_OWNER := google -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_DEX_PREOPT := false -LOCAL_OVERRIDES_PACKAGES := DeviceIntelligenceNetworkPrebuilt -LOCAL_PRIVILEGED_MODULE := true -LOCAL_SRC_FILES := apks/$(LOCAL_MODULE).apk -LOCAL_PRODUCT_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := DevicePersonalizationPrebuiltPixel2021 -LOCAL_MODULE_OWNER := google -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_DEX_PREOPT := false -LOCAL_OVERRIDES_PACKAGES := DevicePersonalizationPrebuiltPixel2 DevicePersonalizationPrebuiltPixel3 DevicePersonalizationPrebuiltPixel4 DevicePersonalizationPrebuiltPixel2020 DeviceIntelligenceNetworkPrebuilt -LOCAL_PRIVILEGED_MODULE := true -LOCAL_SRC_FILES := apks/$(LOCAL_MODULE).apk -LOCAL_PRODUCT_MODULE := true -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := GoogleExtServicesMobile LOCAL_MODULE_OWNER := google diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk index 7b24e75..8dd012b 100644 --- a/apps/GoogleApps.mk +++ b/apps/GoogleApps.mk @@ -25,11 +25,6 @@ PRODUCT_PACKAGES += \ GoogleCamera endif -## Only build DevicePersonalizationServices on non-Pixels -PRODUCT_PACKAGES += \ - DeviceIntelligenceNetworkPrebuilt2021 \ - DevicePersonalizationPrebuiltPixel2021 - # AiAi Allowlist PRODUCT_COPY_FILES += \ vendor/google_pixel/apps/sysconfig/aiai_allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/aiai_allowlist.xml diff --git a/apps/apks/DeviceIntelligenceNetworkPrebuilt2021.apk b/apps/apks/DeviceIntelligenceNetworkPrebuilt2021.apk deleted file mode 100644 index 78350a6..0000000 Binary files a/apps/apks/DeviceIntelligenceNetworkPrebuilt2021.apk and /dev/null differ diff --git a/apps/apks/DevicePersonalizationPrebuiltPixel2021.apk b/apps/apks/DevicePersonalizationPrebuiltPixel2021.apk deleted file mode 100644 index 3791d8e..0000000 Binary files a/apps/apks/DevicePersonalizationPrebuiltPixel2021.apk and /dev/null differ