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

Commit 12b6499a authored by Chris Craik's avatar Chris Craik Committed by gitbuildkicker
Browse files

Revert "Switch libplatformproto to sharedlib" 

Bug:36847782

This reverts commit e5549d41.

Change-Id: I38f1c501b7e40be11ba5f0a7a50651e0c3e41fc5
(cherry picked from commit 817b4947)
parent 9fffe1c7

Android.mk

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

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

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

LOCAL_SHARED_LIBRARIES := libprotobuf-cpp-full

include $(BUILD_SHARED_LIBRARY)

include $(BUILD_STATIC_LIBRARY)



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

include $(CLEAR_VARS)

libs/hwui/hwui_static_deps.mk

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

    libminikin \

    libandroidfw \

    libRScpp \

    libRScpp



LOCAL_STATIC_LIBRARIES += \

    libplatformprotos