commit d15c030f7255ec9db8567a4ee77a56844982586d
author Steven Moreland <smoreland@google.com> Tue Dec 20 11:14:50 2016 -0800
committer Ashutosh Joshi <ashutoshj@google.com> Tue Feb 14 11:34:09 2017 -0800
tree d71bfd52b7931bfa0858f203f9b645cba86207c3
parent 33bc71ff9524457ad4e0f57523d676b500701370

sensorservice: Start using HIDL sensor HAL.

Framework now use the HIDL sensor HAL only. Loading the legacy
HAL library is removed.

Bug: 32978887
Test: sensors stream data in both passthrough and binderized mode.
Change-Id: I1d700a5a23cd9d209559570439f306aa22c613c1

services/sensorservice/Android.mk

diff --git a/services/sensorservice/Android.mk b/services/sensorservice/Android.mk
index c41630a..d61f26f 100644
--- a/services/sensorservice/Android.mk
+++ b/services/sensorservice/Android.mk
@@ -10,6 +10,7 @@
     OrientationSensor.cpp \
     RecentEventLogger.cpp \
     RotationVectorSensor.cpp \
+    SensorDevice.cpp \
     SensorDirectConnection.cpp \
     SensorEventConnection.cpp \
     SensorFusion.cpp \
@@ -25,13 +26,6 @@
 
 LOCAL_CFLAGS += -fvisibility=hidden
 
-ifeq ($(ENABLE_TREBLE), true)
-LOCAL_SRC_FILES += SensorDeviceTreble.cpp
-LOCAL_CFLAGS += -DENABLE_TREBLE=1
-else
-LOCAL_SRC_FILES += SensorDevice.cpp
-endif
-
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libhardware \
@@ -42,10 +36,6 @@
     libui \
     libgui \
     libcrypto \
-
-ifeq ($(ENABLE_TREBLE), true)
-
-LOCAL_SHARED_LIBRARIES += \
     libbase \
     libhidlbase \
     libhidltransport \
@@ -55,8 +45,6 @@
 LOCAL_STATIC_LIBRARIES := \
     android.hardware.sensors@1.0-convert
 
-endif  # ENABLE_TREBLE
-
 LOCAL_MODULE:= libsensorservice
 
 include $(BUILD_SHARED_LIBRARY)