diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-03-02 10:54:52 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-05-19 18:38:26 +0200 |
| commit | 5c2dd97be0a197f6d4004f9528026025c7e4f248 (patch) | |
| tree | 9aa4f7c6ed328078055f9340780b2246202541dd /library | |
| parent | 94968516ca9ae681df18f463c2f66ce0f8c5c5c0 (diff) | |
| download | multidex-5c2dd97be0a197f6d4004f9528026025c7e4f248.tar.gz | |
[DO NOT MERGE] Declare Jack multidex configurationandroid-m-preview-1android-m-preview
(cherry picked from commit 805db15e4d7baa57062ad08fb03eeac8691475c8)
Change-Id: I4cae9fa3ba272690461c29bf8d9779350b99ae52
Diffstat (limited to 'library')
| -rw-r--r-- | library/Android.mk | 5 | ||||
| -rw-r--r-- | library/jack-meta/legacyMultidexInstallation.jpp (renamed from library/resources/JACK-INF/legacyMultidexInstallation.jpp) | 0 |
2 files changed, 1 insertions, 4 deletions
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 @@ $(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 +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 index 8a81eba..8a81eba 100644 --- a/library/resources/JACK-INF/legacyMultidexInstallation.jpp +++ b/library/jack-meta/legacyMultidexInstallation.jpp |