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

Commit a9abc487 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 1f637158: Merge "Use platform protobuf unless building with NDK." 

* commit '1f637158':
  Use platform protobuf unless building with NDK.
parents 20228b6e 1f637158

core/binary.mk

+12 −2
Original line number Diff line number Diff line
@@ -563,13 +563,23 @@ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full) 
        $(warning Stripping unneeded dependency on libprotobuf-cpp-2.3.0-full in $(LOCAL_MODULE))

        my_static_libraries := $(filter-out libprotobuf-cpp-2.3.0-full,$(my_static_libraries))

    endif



    ifdef LOCAL_SDK_VERSION

        my_static_libraries += libprotobuf-cpp-full

    else

        my_shared_libraries += libprotobuf-cpp-full

    endif

else

    ifneq ($(filter libprotobuf-cpp-2.3.0-lite,$(my_static_libraries)),)

        $(warning Stripping unneeded dependency on libprotobuf-cpp-2.3.0-lite in $(LOCAL_MODULE))

        my_static_libraries := $(filter-out libprotobuf-cpp-2.3.0-lite,$(my_static_libraries))

    endif



    ifdef LOCAL_SDK_VERSION

        my_static_libraries += libprotobuf-cpp-lite

    else

        my_shared_libraries += libprotobuf-cpp-lite

    endif

endif

endif  # $(proto_sources) non-empty