diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-03-02 10:54:52 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-03-02 10:54:52 +0100 |
| commit | 805db15e4d7baa57062ad08fb03eeac8691475c8 (patch) | |
| tree | 9aa4f7c6ed328078055f9340780b2246202541dd | |
| parent | 94968516ca9ae681df18f463c2f66ce0f8c5c5c0 (diff) | |
| download | android_frameworks_multidex-replicant-6.0-0004-rc5.tar.gz android_frameworks_multidex-replicant-6.0-0004-rc5.tar.bz2 android_frameworks_multidex-replicant-6.0-0004-rc5.zip | |
Declare Jack multidex configurationHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0
Change-Id: I807ab1791b1704b5b2ec48c608ac474e0d2b7850
| -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 |