diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-16 00:06:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 00:06:05 +0000 |
| commit | 861f88765ba996abde165c6cd70378dfddfe5828 (patch) | |
| tree | 2b67eea7a87715d9fd27a27e0521519af9d5bcdb /core/java.mk | |
| parent | 6c61e37f4ab3b6086c07989a44303b1514a3e7f5 (diff) | |
| parent | 0c949bd86773c5d39df11cd824c9df372dc00342 (diff) | |
| download | build-861f88765ba996abde165c6cd70378dfddfe5828.zip build-861f88765ba996abde165c6cd70378dfddfe5828.tar.gz build-861f88765ba996abde165c6cd70378dfddfe5828.tar.bz2 | |
am 0c949bd8: am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."
* commit '0c949bd86773c5d39df11cd824c9df372dc00342':
Update protobuf library from 2.3 to 2.6.
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/core/java.mk b/core/java.mk index 31f32dd..88fa8ae 100644 --- a/core/java.mk +++ b/core/java.mk @@ -44,23 +44,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 |