commit 5cafc1e086db67911f937b68d35f0955e0a37caf
author Ashutosh Joshi <ashutoshj@google.com> Thu Feb 09 21:44:04 2017 +0000
committer Ashutosh Joshi <ashutoshj@google.com> Thu Feb 09 21:44:04 2017 +0000
tree 4dab2b26bec5c23c8727bc40cc5f3b716315f907
parent d333511e94afbcc6462dd9c81405f4a3e30ecac9

Revert "sensorservice: Remove ENABLE_TREBLE flag."

This reverts commit d333511e94afbcc6462dd9c81405f4a3e30ecac9.

Change-Id: I6812643a7d0265f3a64a03a35e4d5a2359ba87cf

services/sensorservice/Android.mk

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