StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'feb3ecaff02d2bddb82aae0fa3024d9b9a62169e':
  Fix name for NDK protobuf libraries.
This commit is contained in:
Dan Albert
2015-09-09 18:19:11 +00:00
committed by Android Git Automerger
parent 5ffff55bbd feb3ecaff0
commit 4ecedbc823
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/binary.mk
View File

@@ -620,13 +620,13 @@ else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nanopb-c)
my_static_libraries += libprotobuf-c-nano my_static_libraries += libprotobuf-c-nano
else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full) else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)
ifdef LOCAL_SDK_VERSION ifdef LOCAL_SDK_VERSION
my_static_libraries += libprotobuf-cpp-full my_static_libraries += libprotobuf-cpp-full-ndk
else else
my_shared_libraries += libprotobuf-cpp-full my_shared_libraries += libprotobuf-cpp-full
endif endif
else else
ifdef LOCAL_SDK_VERSION ifdef LOCAL_SDK_VERSION
my_static_libraries += libprotobuf-cpp-lite my_static_libraries += libprotobuf-cpp-lite-ndk
else else
my_shared_libraries += libprotobuf-cpp-lite my_shared_libraries += libprotobuf-cpp-lite
endif endif