From af45f3e2618d2952d0c4d7b6cbcd0df0ad878550 Mon Sep 17 00:00:00 2001 From: Rick Chen Date: Fri, 14 May 2021 00:37:20 +0800 Subject: [PATCH] Update sensor HAL to 2.1. Bug: 187237947 Test: Verified basic sensor sampling function. run atest VtsHalSensorsV2_1TargetTest and result is passed. Signed-off-by: Rick Chen Change-Id: If081e8afbfb71b5f9276c5ef023a41e7b8590419 --- device.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/device.mk b/device.mk index 730fbec7..6c04882a 100644 --- a/device.mk +++ b/device.mk @@ -306,19 +306,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml -# Set USF sensor HAL to 2.0. -USF_SENSOR_HAL_2_0 := true - -ifeq ($(USF_SENSOR_HAL_2_0),true) - # Add sensor HAL 2.0 product packages - PRODUCT_PACKAGES += android.hardware.sensors@2.0-service.multihal -else - # Add sensor HAL 1.0 product packages. - PRODUCT_PACKAGES += \ - android.hardware.sensors@1.0-impl \ - android.hardware.sensors@1.0-service \ - sensors.gs101 -endif +# Add sensor HAL 2.1 product packages +PRODUCT_PACKAGES += android.hardware.sensors@2.1-service.multihal # USB HAL PRODUCT_PACKAGES += \