am d76348dc: (-s ours) am 5c2dd97b: (-s ours) [DO NOT MERGE] Declare Jack multidex configuration
* commit 'd76348dc71ea7d71defa0d6577face75ff133904':
[DO NOT MERGE] Declare Jack multidex configuration
diff --git a/library/Android.mk b/library/Android.mk
index dd8a6ff..be549b3 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -36,9 +36,6 @@
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
+LOCAL_JACK_FLAGS:=--import-meta $(LOCAL_PATH)/jack-meta
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/library/resources/JACK-INF/legacyMultidexInstallation.jpp b/library/jack-meta/legacyMultidexInstallation.jpp
similarity index 100%
rename from library/resources/JACK-INF/legacyMultidexInstallation.jpp
rename to library/jack-meta/legacyMultidexInstallation.jpp