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

Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."

Browse Source
This commit is contained in:
Jeff Davidson
2014-10-29 17:35:16 +00:00
committed by Gerrit Code Review
parent 93cb8c7d95 b8ddd55b55
commit 427d1e98ec
3 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/binary.mk
View File

@@ -550,9 +550,17 @@ $(proto_generated_objects): $(proto_generated_obj_dir)/%.o: $(proto_generated_cc
my_c_includes += external/protobuf/src $(proto_generated_cc_sources_dir)
my_cflags += -DGOOGLE_PROTOBUF_NO_RTTI
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full)
my_static_libraries += libprotobuf-cpp-2.3.0-full
ifneq ($(filter libprotobuf-cpp-2.3.0-full,$(my_static_libraries)),)
$(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
else
my_static_libraries += libprotobuf-cpp-2.3.0-lite
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
endif
endif # $(proto_sources) non-empty