diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-08 16:33:43 -0800 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-01-08 16:35:11 -0800 |
| commit | b1055a195afa118bf8d8ea2a81dc5c6595090291 (patch) | |
| tree | cf405d65ae504b0da6c085b7d703f6ce2487d943 | |
| parent | aa112716067167d58d1db37aaf8adc49b83b59a1 (diff) | |
| download | build-b1055a195afa118bf8d8ea2a81dc5c6595090291.zip build-b1055a195afa118bf8d8ea2a81dc5c6595090291.tar.gz build-b1055a195afa118bf8d8ea2a81dc5c6595090291.tar.bz2 | |
Update protobuf library from 2.3 to 2.6.
Change-Id: I02d308b01f635307dbb63ea9610db2e56eb1f31b
| -rw-r--r-- | core/binary.mk | 10 | ||||
| -rw-r--r-- | core/host_java_library_common.mk | 12 | ||||
| -rw-r--r-- | core/java.mk | 12 |
3 files changed, 0 insertions, 34 deletions
diff --git a/core/binary.mk b/core/binary.mk index 752a5c3..e16b736 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -556,22 +556,12 @@ $(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) - 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 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 - ifdef LOCAL_SDK_VERSION my_static_libraries += libprotobuf-cpp-lite else diff --git a/core/host_java_library_common.mk b/core/host_java_library_common.mk index a675a84..cd9e679 100644 --- a/core/host_java_library_common.mk +++ b/core/host_java_library_common.mk @@ -29,23 +29,11 @@ all_res_assets := proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES)) ifneq ($(proto_sources),) 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 else 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 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 endif endif diff --git a/core/java.mk b/core/java.mk index 98d5138..bdba680 100644 --- a/core/java.mk +++ b/core/java.mk @@ -42,23 +42,11 @@ endif proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES)) ifneq ($(proto_sources),) 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 else 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 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 endif endif |