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

Commit a7e01d7d authored by Alex Yakavenka's avatar Alex Yakavenka Committed by android-build-merger
Browse files

Merge "Compile manager-lib shared library" into oc-dev 

am: fe4705fa

Change-Id: Ia54a09338625ddd4006b4c831e6000317ce69ede
parents e18fdf9e fe4705fa

automotive/vehicle/2.0/default/Android.mk

+25 −4
Original line number Diff line number Diff line
@@ -37,13 +37,37 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ 
LOCAL_SHARED_LIBRARIES := \

    libhidlbase \

    libhidltransport \

    libhwbinder \

    liblog \

    libutils \

    $(vhal_v2_0) \



include $(BUILD_STATIC_LIBRARY)





include $(CLEAR_VARS)

LOCAL_MODULE := $(vhal_v2_0)-manager-lib-shared

LOCAL_SRC_FILES := \

    common/src/SubscriptionManager.cpp \

    common/src/VehicleHalManager.cpp \

    common/src/VehicleObjectPool.cpp \

    common/src/VehiclePropertyStore.cpp \

    common/src/VehicleUtils.cpp \



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/common/include/vhal_v2_0



LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(LOCAL_PATH)/common/include



LOCAL_SHARED_LIBRARIES := \

    libhidlbase \

    libhidltransport \

    liblog \

    libutils \

    $(vhal_v2_0) \



include $(BUILD_SHARED_LIBRARY)



###############################################################################

# Vehicle HAL Protobuf library

###############################################################################
@@ -91,7 +115,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libbase \

    libhidlbase \

    libhidltransport \

    libhwbinder \

    liblog \

    libprotobuf-cpp-lite \

    libutils \
@@ -128,7 +151,6 @@ LOCAL_HEADER_LIBRARIES := \ 
LOCAL_SHARED_LIBRARIES := \

    libhidlbase \

    libhidltransport \

    libhwbinder \

    liblog \

    libutils \

    $(vhal_v2_0) \
@@ -155,7 +177,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libbase \

    libhidlbase \

    libhidltransport \

    libhwbinder \

    liblog \

    libprotobuf-cpp-lite \

    libutils \