tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit 'a9abc487a8fdf3a82932df3f70efd9aab7fb9d35':
  Use platform protobuf unless building with NDK.
This commit is contained in:
Dan Albert 2014-11-11 20:05:56 +00:00 committed by Android Git Automerger
commit 655f7c9a82
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

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