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

Merge "Update protobuf library from 2.3 to 2.6."

Browse Source
This commit is contained in:
Jeff Davidson
2015-01-15 22:49:00 +00:00
committed by Gerrit Code Review
parent 5f31338c1b b1055a195a
commit 64606bd5b0
3 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/binary.mk
View File

@@ -533,22 +533,12 @@ $(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)
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
ifdef LOCAL_SDK_VERSION ifdef LOCAL_SDK_VERSION
my_static_libraries += libprotobuf-cpp-full my_static_libraries += libprotobuf-cpp-full
else else
my_shared_libraries += libprotobuf-cpp-full my_shared_libraries += libprotobuf-cpp-full
endif endif
else 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
ifdef LOCAL_SDK_VERSION ifdef LOCAL_SDK_VERSION
my_static_libraries += libprotobuf-cpp-lite my_static_libraries += libprotobuf-cpp-lite
else else

12
core/host_java_library_common.mk
View File

@@ -29,23 +29,11 @@ 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)
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 LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-micro
else else
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),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 LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-nano
else else
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 LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-lite
endif endif
endif endif

12
core/java.mk
View File

@@ -42,23 +42,11 @@ 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)
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 LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-micro
else else
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),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 LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-nano
else else
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 LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-lite
endif endif
endif endif