diff options
| author | Jeff Davidson <jpd@google.com> | 2014-09-15 17:51:11 -0700 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2014-10-23 07:20:16 -0700 |
| commit | b8ddd55b55e1016ad1b6f8f2171aa4ee3e91aec2 (patch) | |
| tree | a2ed6e235100de3bbd465e297b767a8627dc0129 /core/java.mk | |
| parent | f2bdac77b1d99abb190253f386cc6ffe4ffbeaca (diff) | |
| download | build-b8ddd55b55e1016ad1b6f8f2171aa4ee3e91aec2.zip build-b8ddd55b55e1016ad1b6f8f2171aa4ee3e91aec2.tar.gz build-b8ddd55b55e1016ad1b6f8f2171aa4ee3e91aec2.tar.bz2 | |
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
If a module is explicitly depending on a versioned protolib, we strip
the dependency and log a warning so the unneeded dependency can be
removed.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/core/java.mk b/core/java.mk index 049bc51..8fdf61a 100644 --- a/core/java.mk +++ b/core/java.mk @@ -40,12 +40,24 @@ endif proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES)) ifneq ($(proto_sources),) ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro) - LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-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) - LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-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 - LOCAL_STATIC_JAVA_LIBRARIES += libprotobuf-java-2.3.0-lite + 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 endif |