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

Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."

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
Show Stats 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_c_includes += external/protobuf/src $(proto_generated_cc_sources_dir)
my_cflags += -DGOOGLE_PROTOBUF_NO_RTTI my_cflags += -DGOOGLE_PROTOBUF_NO_RTTI
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),full) 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 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
endif # $(proto_sources) non-empty endif # $(proto_sources) non-empty

18
core/host_java_library_common.mk
View File

@ -29,12 +29,24 @@ all_res_assets :=
proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES)) proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))
ifneq ($(proto_sources),) ifneq ($(proto_sources),)
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-2.3.0-micro ifneq ($(filter host-libprotobuf-java-2.3.0-micro,$(LOCAL_JAVA_LIBRARIES)),)
$(warning Stripping unneeded dependency on host-libprotobuf-java-2.3.0-micro in $(LOCAL_MODULE))
LOCAL_JAVA_LIBRARIES := $(filter-out host-libprotobuf-java-2.3.0-micro,$(LOCAL_JAVA_LIBRARIES))
endif
LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-micro
else else
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-2.3.0-nano ifneq ($(filter host-libprotobuf-java-2.3.0-nano,$(LOCAL_JAVA_LIBRARIES)),)
$(warning Stripping unneeded dependency on host-libprotobuf-java-2.3.0-nano in $(LOCAL_MODULE))
LOCAL_JAVA_LIBRARIES := $(filter-out host-libprotobuf-java-2.3.0-nano,$(LOCAL_JAVA_LIBRARIES))
endif
LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-nano
else else
LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-2.3.0-lite ifneq ($(filter host-libprotobuf-java-2.3.0-lite,$(LOCAL_JAVA_LIBRARIES)),)
$(warning Stripping unneeded dependency on host-libprotobuf-java-2.3.0-lite in $(LOCAL_MODULE))
LOCAL_JAVA_LIBRARIES := $(filter-out host-libprotobuf-java-2.3.0-lite,$(LOCAL_JAVA_LIBRARIES))
endif
LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-lite
endif endif
endif endif
endif endif

18
core/java.mk
View File

@ -40,12 +40,24 @@ endif
proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES)) proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))
ifneq ($(proto_sources),) ifneq ($(proto_sources),)
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-micro ifneq ($(filter libprotobuf-java-2.3.0-micro,$(LOCAL_STATIC_JAVA_LIBRARIES)),)
$(warning Stripping unneeded dependency on libprotobuf-java-2.3.0-micro in $(LOCAL_MODULE))
LOCAL_STATIC_JAVA_LIBRARIES := $(filter-out libprotobuf-java-2.3.0-micro,$(LOCAL_STATIC_JAVA_LIBRARIES))
endif
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-micro
else else
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-nano ifneq ($(filter libprotobuf-java-2.3.0-nano,$(LOCAL_STATIC_JAVA_LIBRARIES)),)
$(warning Stripping unneeded dependency on libprotobuf-java-2.3.0-nano in $(LOCAL_MODULE))
LOCAL_STATIC_JAVA_LIBRARIES := $(filter-out libprotobuf-java-2.3.0-nano,$(LOCAL_STATIC_JAVA_LIBRARIES))
endif
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-nano
else else
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-lite ifneq ($(filter libprotobuf-java-2.3.0-lite,$(LOCAL_STATIC_JAVA_LIBRARIES)),)
$(warning Stripping unneeded dependency on libprotobuf-java-2.3.0-lite in $(LOCAL_MODULE))
LOCAL_STATIC_JAVA_LIBRARIES := $(filter-out libprotobuf-java-2.3.0-lite,$(LOCAL_STATIC_JAVA_LIBRARIES))
endif
LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-lite
endif endif
endif endif
endif endif