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

Commit af39ba5d authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Switch libplatformproto to sharedlib" into oc-dev 

am: 72c27609

Change-Id: I534c8d890499dbd7fbe456fa407b10e34d2a5eb3
parents 1f3f5955 72c27609

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,8 @@ LOCAL_PROTOC_FLAGS := \ 
LOCAL_SRC_FILES := \

    $(call all-proto-files-under, core/proto) \

    $(call all-proto-files-under, libs/incident/proto)

include $(BUILD_STATIC_LIBRARY)

LOCAL_SHARED_LIBRARIES := libprotobuf-cpp-full

include $(BUILD_SHARED_LIBRARY)



# ====  c++ proto host library  ==============================

include $(CLEAR_VARS)

libs/hwui/hwui_static_deps.mk

+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,5 @@ LOCAL_SHARED_LIBRARIES += \ 
    libft2 \

    libminikin \

    libandroidfw \

    libRScpp



LOCAL_STATIC_LIBRARIES += \

    libRScpp \

    libplatformprotos