p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Use platform protobuf unless building with NDK."

This commit is contained in:
Dan Albert 2014-11-11 19:28:34 +00:00 committed by Gerrit Code Review
parent b389394361 c3031c70f7
commit 1f6371583e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/binary.mk
View File

@ -561,13 +561,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
my_static_libraries += libprotobuf-cpp-full
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
my_static_libraries += libprotobuf-cpp-lite
ifdef LOCAL_SDK_VERSION
my_static_libraries += libprotobuf-cpp-lite
else
my_shared_libraries += libprotobuf-cpp-lite
endif
endif
endif # $(proto_sources) non-empty