diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-15 22:49:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-15 22:49:00 +0000 |
| commit | 64606bd5b0b702b7f6d7fd1088486b5380ccc25f (patch) | |
| tree | 4a21e612a3be94a224a8b85fa6266a013ace86d1 /core | |
| parent | 5f31338c1bbc0a958d390d7b21ecf5fc66d29ffd (diff) | |
| parent | b1055a195afa118bf8d8ea2a81dc5c6595090291 (diff) | |
| download | build-64606bd5b0b702b7f6d7fd1088486b5380ccc25f.zip build-64606bd5b0b702b7f6d7fd1088486b5380ccc25f.tar.gz build-64606bd5b0b702b7f6d7fd1088486b5380ccc25f.tar.bz2 | |
Merge "Update protobuf library from 2.3 to 2.6."
Diffstat (limited to 'core')
| -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 22936b9..e6115b0 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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_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 13cf39d..428a9ce 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 |