diff options
| author | Marcin Kosiba <mkosiba@google.com> | 2014-06-20 14:38:59 +0100 |
|---|---|---|
| committer | Marcin Kosiba <mkosiba@google.com> | 2014-06-20 14:38:59 +0100 |
| commit | efcdc13d162a49f42182535680e089bbbd6484b0 (patch) | |
| tree | eddaead6d013667cc118937f278c2d65c5ad1182 | |
| parent | 83503c4f883e1ea9790509d7e477ea87b74a64ed (diff) | |
| download | platform_external_jarjar-efcdc13d162a49f42182535680e089bbbd6484b0.tar.gz platform_external_jarjar-efcdc13d162a49f42182535680e089bbbd6484b0.tar.bz2 platform_external_jarjar-efcdc13d162a49f42182535680e089bbbd6484b0.zip | |
Prefix local prebuilt libraries.
This is to keep them from conflicting with other prebuilts.
Change-Id: I183e51998c72731227c81a7ce80fa04f8e706a7e
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -17,11 +17,13 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/main) +LOCAL_STATIC_JAVA_LIBRARIES := \ + jarjar-asm \ + jarjar-asm-commons \ + LOCAL_JAVA_LIBRARIES := \ - asm-tools \ - asm-commons \ - maven-plugin-api \ - apache-ant + jarjar-maven-plugin-api \ + jarjar-apache-ant LOCAL_MODULE := jarjar LOCAL_MODULE_TAGS := optional @@ -34,10 +36,10 @@ include $(BUILD_HOST_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_PREBUILT_JAVA_LIBRARIES := \ - asm-tools:lib/asm-4.0$(COMMON_JAVA_PACKAGE_SUFFIX) \ - asm-commons:lib/asm-commons-4.0$(COMMON_JAVA_PACKAGE_SUFFIX) \ - maven-plugin-api:lib/maven-plugin-api$(COMMON_JAVA_PACKAGE_SUFFIX) \ - apache-ant:lib/apache-ant-1.9.4$(COMMON_JAVA_PACKAGE_SUFFIX) + jarjar-asm:lib/asm-4.0$(COMMON_JAVA_PACKAGE_SUFFIX) \ + jarjar-asm-commons:lib/asm-commons-4.0$(COMMON_JAVA_PACKAGE_SUFFIX) \ + jarjar-maven-plugin-api:lib/maven-plugin-api$(COMMON_JAVA_PACKAGE_SUFFIX) \ + jarjar-apache-ant:lib/apache-ant-1.9.4$(COMMON_JAVA_PACKAGE_SUFFIX) LOCAL_MODULE_TAGS := optional |