From 8ff9189b2ba87961e2c99baca10f683e3d278264 Mon Sep 17 00:00:00 2001 From: Jenna-they-them Date: Wed, 13 Mar 2024 14:24:13 +0100 Subject: [PATCH] sm7125-common: Don't add google-hotword when building with microG Signed-off-by: Jenna-they-them --- sm7125-common-vendor.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sm7125-common-vendor.mk b/sm7125-common-vendor.mk index 5955694..c6c4537 100644 --- a/sm7125-common-vendor.mk +++ b/sm7125-common-vendor.mk @@ -7,7 +7,6 @@ PRODUCT_SOONG_NAMESPACES += \ PRODUCT_COPY_FILES += \ vendor/samsung/sm7125-common/proprietary/system_ext/etc/permissions/audiosphere.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/audiosphere.xml \ - vendor/samsung/sm7125-common/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \ vendor/samsung/sm7125-common/proprietary/system_ext/lib/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/fm_helium.so \ vendor/samsung/sm7125-common/proprietary/system_ext/lib/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libfm-hci.so \ vendor/samsung/sm7125-common/proprietary/system_ext/lib/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.fm@1.0.so \ @@ -1028,13 +1027,20 @@ PRODUCT_PACKAGES += \ libskeymaster4device \ CACertService \ TimeService \ - HotwordEnrollmentOKGoogleEx3HEXAGON \ - HotwordEnrollmentXGoogleEx3HEXAGON \ audiosphere \ - com.android.hotwordenrollment.common.util \ android.hardware.gnss@2.1-service-qti \ android.hardware.health@2.1-samsung \ android.hardware.neuralnetworks@1.3-service-qti-hta \ android.hardware.neuralnetworks@1.3-service-qti \ manifest_android.hardware.drm@1.3-service.widevine \ vendor.samsung.hardware.thermal@1.0-manifest + +ifeq ($(WITH_MICROG),false) + PRODUCT_COPY_FILES += \ + vendor/samsung/sm7125-common/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml + + PRODUCT_PACKAGES += \ + HotwordEnrollmentOKGoogleEx3HEXAGON \ + HotwordEnrollmentXGoogleEx3HEXAGON \ + com.android.hotwordenrollment.common.util +endif