Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d333511e authored by Steven Moreland's avatar Steven Moreland Committed by Ashutosh Joshi
Browse files

sensorservice: Remove ENABLE_TREBLE flag. 

Only hidl hals should be built/referenced by the framework,
and ENABLE_TREBLE will be deprecated soon.

Bug: 32978887
Test: compiles/wip
Change-Id: Ibb32129e1f30ae5baa15e116d3b13cc72bf27395
parent 2c275922

services/sensorservice/Android.mk

+1 −13
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ LOCAL_SRC_FILES:= \ 
    OrientationSensor.cpp \

    RecentEventLogger.cpp \

    RotationVectorSensor.cpp \

    SensorDevice.cpp \

    SensorDirectConnection.cpp \

    SensorEventConnection.cpp \

    SensorFusion.cpp \
@@ -25,13 +26,6 @@ LOCAL_CFLAGS += -Wall -Werror -Wextra 


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 @@ LOCAL_SHARED_LIBRARIES := \ 
    libui \

    libgui \

    libcrypto \



ifeq ($(ENABLE_TREBLE), true)



LOCAL_SHARED_LIBRARIES += \

    libbase \

    libhidlbase \

    libhidltransport \
@@ -55,8 +45,6 @@ LOCAL_SHARED_LIBRARIES += \ 
LOCAL_STATIC_LIBRARIES := \

    android.hardware.sensors@1.0-convert



endif  # ENABLE_TREBLE



LOCAL_MODULE:= libsensorservice



include $(BUILD_SHARED_LIBRARY)

services/sensorservice/SensorDevice.cpp

+306 −201

File changed.

Preview size limit exceeded, changes collapsed.

services/sensorservice/SensorDevice.h

+3 −12

File changed.

Preview size limit exceeded, changes collapsed.

services/sensorservice/SensorDeviceTreble.cpp

deleted100644 → 0
+0 −639

File deleted.

Preview size limit exceeded, changes collapsed.