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

Commit f188cb57 authored by Ashutosh Joshi's avatar Ashutosh Joshi Committed by Android (Google) Code Review
Browse files

Merge "Revert "sensorservice: Remove ENABLE_TREBLE flag.""

parents 0f319ab6 5cafc1e0

services/sensorservice/Android.mk

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

    RecentEventLogger.cpp \

    RotationVectorSensor.cpp \

    SensorDevice.cpp \

    SensorDirectConnection.cpp \

    SensorEventConnection.cpp \

    SensorFusion.cpp \
@@ -26,6 +25,13 @@ 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 \
@@ -36,6 +42,10 @@ LOCAL_SHARED_LIBRARIES := \ 
    libui \

    libgui \

    libcrypto \



ifeq ($(ENABLE_TREBLE), true)



LOCAL_SHARED_LIBRARIES += \

    libbase \

    libhidlbase \

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

    android.hardware.sensors@1.0-convert



endif  # ENABLE_TREBLE



LOCAL_MODULE:= libsensorservice



include $(BUILD_SHARED_LIBRARY)