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

Commit eabb5621 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Revert "Switch libplatformproto to sharedlib"" into oc-dev

parents 2ac96982 817b4947

Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -1460,8 +1460,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