diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-10-20 17:13:41 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-10-24 12:35:42 +0200 |
| commit | 6624fbd355c4b3c874bec920aab662b2056a7278 (patch) | |
| tree | 8e20848f36c32d0fbb8b60c49febf2a618fd16df /library | |
| parent | bec7f278895a0f9cfd77fd86cb795b66ffe96149 (diff) | |
| download | multidex-6624fbd355c4b3c874bec920aab662b2056a7278.tar.gz | |
Package legacyMultidexInstallation.jpp
To allow automatic configuration when using Jill/Jack.
This is a temporary change untill Jack and Jill are fully
integrated into the SDK build tools.
(cherry picked from commit f50beca07827921e005ce6825bbc874a843f91e1)
Bug: 18112662
Change-Id: I8b9292b05c90d790edade62ac682dba35e7d3e96
Diffstat (limited to 'library')
| -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 |