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

Fix name for NDK protobuf libraries.

Browse Source 
Name them *-ndk so it's clear which library is which.

Change-Id: I53544a8a97488f902e00d1aedaa021d09ee2f649
This commit is contained in:
Dan Albert
2015-09-08 10:47:03 -07:00
parent e711afb154
commit a187fb5986
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

@@ -618,13 +618,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