diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-25 10:08:51 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-25 17:13:54 +0000 |
| commit | 9437b78780f9e6ffa5797ebe82de8e8d7f3a5ed6 (patch) | |
| tree | d99027ae9295f162865c01f9a8795ac8cda09b84 /test/etc | |
| parent | 11e99b19f48576f1bb6d0993635b34b6e09c9832 (diff) | |
| download | art-9437b78780f9e6ffa5797ebe82de8e8d7f3a5ed6.zip art-9437b78780f9e6ffa5797ebe82de8e8d7f3a5ed6.tar.gz art-9437b78780f9e6ffa5797ebe82de8e8d7f3a5ed6.tar.bz2 | |
Revert "Revert "Inline across dex files.""
This reverts commit 6a816cf624ba56bf2872916d7b65b18fd9a411ef.
Change-Id: I36cb524108786dd7996f2aea0443675be1f1b859
Diffstat (limited to 'test/etc')
| -rwxr-xr-x | test/etc/default-build | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/etc/default-build b/test/etc/default-build index 58c9564..fbe97f9 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -39,7 +39,7 @@ if [ -e classes.dex ]; then fi mkdir classes -${JAVAC} -d classes `find src -name '*.java'` +${JAVAC} -implicit:none -classpath src-multidex -d classes `find src -name '*.java'` if [ -d src2 ]; then ${JAVAC} -d classes `find src2 -name '*.java'` @@ -72,6 +72,15 @@ if [ -d src-ex ]; then fi fi -if [ ${NEED_DEX} = "true" ]; then +# Create a single jar with two dex files for multidex. +if [ -d src-multidex ]; then + mkdir classes2 + ${JAVAC} -implicit:none -classpath src -d classes2 `find src-multidex -name '*.java'` + if [ ${NEED_DEX} = "true" ]; then + ${DX} -JXmx256m --debug --dex --dump-to=classes2.lst --output=classes2.dex \ + --dump-width=1000 ${DX_FLAGS} classes2 + zip $TEST_NAME.jar classes.dex classes2.dex + fi +elif [ ${NEED_DEX} = "true" ]; then zip $TEST_NAME.jar classes.dex fi |