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

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

Browse Source 
* commit '1f6371583ef6ce3a384262ebb291515f5ca3a7b6':
  Use platform protobuf unless building with NDK.
This commit is contained in:
Dan Albert
2014-11-11 19:58:42 +00:00
committed by Android Git Automerger
parent 20228b6e4a 1f6371583e
commit a9abc487a8
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/binary.mk
View File

@@ -563,13 +563,23 @@ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)
$(warning Stripping unneeded dependency on libprotobuf-cpp-2.3.0-full in $(LOCAL_MODULE)) $(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)) my_static_libraries := $(filter-out libprotobuf-cpp-2.3.0-full,$(my_static_libraries))
endif 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 else
ifneq ($(filter libprotobuf-cpp-2.3.0-lite,$(my_static_libraries)),) 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)) $(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)) my_static_libraries := $(filter-out libprotobuf-cpp-2.3.0-lite,$(my_static_libraries))
endif 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
endif # $(proto_sources) non-empty endif # $(proto_sources) non-empty