sensors: Include proper sensor HAL per board

Bug: 72216718
Test: Manual

Change-Id: I74d1f01c38c1e7712b30ca27fe6c860c06aff7ea
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/device-common.mk b/device-common.mk
index 18b6282..56fedc0 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -101,8 +101,7 @@
     android.hardware.sensors@1.0-service \
     android.hardware.sensors@1.0-impl \
     android.hardware.contexthub@1.0-service \
-    android.hardware.contexthub@1.0-impl \
-    sensors.$(TARGET_PRODUCT)
+    android.hardware.contexthub@1.0-impl
 
 # Nanohub tools
 PRODUCT_PACKAGES += stm32_flash nanoapp_cmd nanotool
diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk
index b5b6bd9..fe6b6b6 100644
--- a/hikey/device-hikey.mk
+++ b/hikey/device-hikey.mk
@@ -38,5 +38,8 @@
 # PowerHAL
 PRODUCT_PACKAGES += power.hikey
 
+# Sensors HAL
+PRODUCT_PACKAGES += sensors.hikey
+
 # Include vendor binaries
 $(call inherit-product-if-exists, vendor/linaro/hikey/device-vendor.mk)
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index 6899a06..49ed263 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -38,5 +38,7 @@
 
 PRODUCT_PACKAGES += power.hikey960
 
+PRODUCT_PACKAGES += sensors.hikey960
+
 # Include vendor binaries
 $(call inherit-product-if-exists, vendor/linaro/hikey960/device-vendor.mk)