diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-24 16:17:56 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-24 16:17:56 +0000 |
| commit | 6a816cf624ba56bf2872916d7b65b18fd9a411ef (patch) | |
| tree | 47d03a97a9b5101ea543beda55f29cce339bd06e /test/etc/default-build | |
| parent | 7e4c3508e4f5512650b63c41f7872a749e99aee9 (diff) | |
| download | art-6a816cf624ba56bf2872916d7b65b18fd9a411ef.tar.gz art-6a816cf624ba56bf2872916d7b65b18fd9a411ef.tar.bz2 art-6a816cf624ba56bf2872916d7b65b18fd9a411ef.zip | |
Revert "Inline across dex files."
bug: 19904089
bug: 19903495
This reverts commit 7e4c3508e4f5512650b63c41f7872a749e99aee9.
Change-Id: I15df746b5f1882cce78eedde6c05c0d3b69bfa4a
Diffstat (limited to 'test/etc/default-build')
| -rwxr-xr-x | test/etc/default-build | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/test/etc/default-build b/test/etc/default-build index 928de575a3..58c9564bab 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -39,7 +39,7 @@ if [ -e classes.dex ]; then fi mkdir classes -${JAVAC} -implicit:none -classpath src-multidex -d classes `find src -name '*.java'` +${JAVAC} -d classes `find src -name '*.java'` if [ -d src2 ]; then ${JAVAC} -d classes `find src2 -name '*.java'` @@ -75,14 +75,3 @@ fi if [ ${NEED_DEX} = "true" ]; then zip $TEST_NAME.jar classes.dex fi - -# 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 -fi |