From 891c1fdd8049652513c9e1eff4dbb8a17f05ec04 Mon Sep 17 00:00:00 2001
From: Rick Chen <rickctchen@google.com>
Date: Thu, 22 Apr 2021 17:31:09 +0800
Subject: [PATCH] gs101: Remove sensor HAL 1.0 config

Also clean up unused sensor HAL config.

Bug: 184720736
Test: Verify basic sampling on O6
      Run VtsHalSensorsV1_0TargetTest and see no test items.
Signed-off-by: Rick Chen <rickctchen@google.com>
Change-Id: I9ba18473132f4bfa37a9fe2bbae4bb3dc015cc0e
---
 device.mk    | 24 ------------------------
 manifest.xml |  9 ---------
 2 files changed, 33 deletions(-)

diff --git a/device.mk b/device.mk
index 99d00267..23018d04 100644
--- a/device.mk
+++ b/device.mk
@@ -289,29 +289,6 @@ 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
 
-# Sensor HAL
-#TARGET_USES_NANOHUB_SENSORHAL := true
-#NANOHUB_SENSORHAL_SENSORLIST := device/google/gs101/sensorhal/sensorlist.cpp
-
-#PRODUCT_PACKAGES += \
-	context_hub.default \
-	android.hardware.sensors@1.0-impl \
-	android.hardware.sensors@1.0-service \
-	sensors.gs101 \
-
-# sensor utilities
-#PRODUCT_PACKAGES += \
-	nanoapp_cmd
-
-# sensor utilities (only for userdebug and eng builds)
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-#PRODUCT_PACKAGES += \
-	nanotool \
-	sensortest
-endif #filter TARGET_BUILD_VARIANT
-
-# Cannot reference variables defined in BoardConfig.mk
-#ifeq ($(BOARD_USES_EXYNOS_SENSORS_DUMMY), true)
 # Set USF sensor HAL to 2.0.
 USF_SENSOR_HAL_2_0 := true
 
@@ -325,7 +302,6 @@ else
 	android.hardware.sensors@1.0-service \
 	sensors.gs101
 endif
-#endif
 
 # USB HAL
 PRODUCT_PACKAGES += \
diff --git a/manifest.xml b/manifest.xml
index 113317a0..342a2b5c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -133,15 +133,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.2::IBootControl/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.neuralnetworks</name>
         <transport>hwbinder</transport>