summaryrefslogtreecommitdiff
path: root/library
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2014-10-20 17:13:41 +0200
committerYohann Roussel <yroussel@google.com>2014-10-20 18:28:23 +0200
commitf50beca07827921e005ce6825bbc874a843f91e1 (patch)
treea6e19ab5d524839e8e589bcdfee508f7b12449fa /library
parent2921acf84ac6114a6e600b7ab0237d835ef9e43f (diff)
downloadmultidex-f50beca07827921e005ce6825bbc874a843f91e1.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. Change-Id: I4ee88cb0191211d79f71f305ac7a42e357ec63c2
Diffstat (limited to 'library')
-rw-r--r--library/Android.mk5
-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