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

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

am 4ecedbc8: am feb3ecaf: Merge "Fix name for NDK protobuf libraries." 

* commit '4ecedbc8':
  Fix name for NDK protobuf libraries.
parents 484617a7 4ecedbc8

core/binary.mk

+2 −2
Original line number Diff line number Diff line
@@ -620,13 +620,13 @@ else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nanopb-c) 
    my_static_libraries += libprotobuf-c-nano

else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)

    ifdef LOCAL_SDK_VERSION

        my_static_libraries += libprotobuf-cpp-full

        my_static_libraries += libprotobuf-cpp-full-ndk

    else

        my_shared_libraries += libprotobuf-cpp-full

    endif

else

    ifdef LOCAL_SDK_VERSION

        my_static_libraries += libprotobuf-cpp-lite

        my_static_libraries += libprotobuf-cpp-lite-ndk

    else

        my_shared_libraries += libprotobuf-cpp-lite

    endif