diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-10-29 07:08:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 07:08:28 +0000 |
| commit | 40cf9f9ea32c480635206670cceeb5b0d64b7bbd (patch) | |
| tree | 8e20848f36c32d0fbb8b60c49febf2a618fd16df | |
| parent | 8581a04a649a432929ef8e8567d6fa4711d23e26 (diff) | |
| parent | ddd65a611834d9a9222603b2e85d558265f0aa85 (diff) | |
| download | multidex-40cf9f9ea32c480635206670cceeb5b0d64b7bbd.tar.gz | |
am ddd65a61: am f50beca0: Package legacyMultidexInstallation.jpp
* commit 'ddd65a611834d9a9222603b2e85d558265f0aa85':
Package legacyMultidexInstallation.jpp
| -rw-r--r-- | library/Android.mk | 5 | ||||
| -rw-r--r-- | library/resources/JACK-INF/legacyMultidexInstallation.jpp (renamed from library/legacyMultidexInstallation.jpp) | 0 |
2 files changed, 5 insertions, 0 deletions
diff --git a/library/Android.mk b/library/Android.mk index 053084f..dd8a6ff 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -36,4 +36,9 @@ $(ASMD_VERSION_INTERMEDIATE): LOCAL_JAVA_RESOURCE_FILES := $(ASMD_VERSION_INTERMEDIATE) +# Use a dir because we have files in subfolders and we want to keep the path into the archive +# +# use "resources" instead of "res" because res is already used for packaging the SDK project +LOCAL_JAVA_RESOURCE_DIRS := resources + include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/library/legacyMultidexInstallation.jpp b/library/resources/JACK-INF/legacyMultidexInstallation.jpp index 8a81eba..8a81eba 100644 --- a/library/legacyMultidexInstallation.jpp +++ b/library/resources/JACK-INF/legacyMultidexInstallation.jpp |