From b87b77a43af98646c08d1c3a678e46696da21ced Mon Sep 17 00:00:00 2001 From: Lei Ju Date: Sat, 17 Feb 2024 10:37:44 -0800 Subject: [PATCH] [gs101] Enable Multiclient HAL Test: 1) complile and flash a gs101 device, passed PTS and CHQTS; 2) checked logs to make sure no sepolicy violations Bug: 247124878 Change-Id: I77925374dee75076de1820227cc8879a053af09b --- device.mk | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/device.mk b/device.mk index ea89db65..baa919f1 100644 --- a/device.mk +++ b/device.mk @@ -69,7 +69,7 @@ PRODUCT_SOONG_NAMESPACES += \ hardware/google/pixel \ device/google/gs101 \ device/google/gs101/powerstats \ - system/chre/host/hal_generic \ + vendor/google_devices/common/chre/host/hal \ vendor/google/whitechapel/tools \ vendor/google/camera \ vendor/google/interfaces \ @@ -339,24 +339,20 @@ PRODUCT_HOST_PACKAGES += \ PRODUCT_PACKAGES += \ messaging -# Contexthub HAL -PRODUCT_PACKAGES += \ - android.hardware.contexthub-service.generic - -# CHRE tools +# CHRE +## tools ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += \ chre_power_test_client \ - chre_test_client + chre_test_client \ + chre_aidl_hal_client endif +## HAL +include device/google/gs-common/chre/hal.mk PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.context_hub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.context_hub.xml - -# Enable the CHRE Daemon -CHRE_USF_DAEMON_ENABLED := true PRODUCT_PACKAGES += \ - chre \ preloaded_nanoapps.json # Filesystem management tools