diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-15 23:01:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 23:01:59 +0000 |
| commit | 0c949bd86773c5d39df11cd824c9df372dc00342 (patch) | |
| tree | 85de86e4c3384ae320d0f69ed9806d5dd6122f03 /core | |
| parent | d57b7c640dbc25fa1265543ca680a222003cf324 (diff) | |
| parent | 64606bd5b0b702b7f6d7fd1088486b5380ccc25f (diff) | |
| download | build-0c949bd86773c5d39df11cd824c9df372dc00342.zip build-0c949bd86773c5d39df11cd824c9df372dc00342.tar.gz build-0c949bd86773c5d39df11cd824c9df372dc00342.tar.bz2 | |
am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."
* commit '64606bd5b0b702b7f6d7fd1088486b5380ccc25f':
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 685f732..9153ef5 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -535,22 +535,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 687546f..e2b55c7 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 |