summaryrefslogtreecommitdiffstats
path: root/test/etc
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-10-20 17:41:32 +0100
committerNicolas Geoffray <ngeoffray@google.com>2014-10-22 13:49:47 +0000
commita3d05a40de076aabf12ea284c67c99ff28b43dbf (patch)
treeacbe183e7637a333bdaaf0910731b053f2be0f26 /test/etc
parent2da28f2a9e79a09a4044521dc4d00320fcdcd041 (diff)
downloadart-a3d05a40de076aabf12ea284c67c99ff28b43dbf.zip
art-a3d05a40de076aabf12ea284c67c99ff28b43dbf.tar.gz
art-a3d05a40de076aabf12ea284c67c99ff28b43dbf.tar.bz2
Implement array creation related DEX instructions.
Implement new-array, filled-new-array, and fill-array-data. Change-Id: I405560d66777a57d881e384265322617ac5d3ce3
Diffstat (limited to 'test/etc')
-rwxr-xr-xtest/etc/default-build9
1 files changed, 8 insertions, 1 deletions
diff --git a/test/etc/default-build b/test/etc/default-build
index faafc1f..009736b 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -26,7 +26,12 @@ fi
if [ ${NEED_DEX} = "true" ]; then
${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes
- zip $TEST_NAME.jar classes.dex
+fi
+
+if [ -r smali ]; then
+ # Compile Smali classes
+ ${SMALI} -JXmx256m --output smali_classes.dex `find smali -name '*.smali'`
+ ${DXMERGER} classes.dex classes.dex smali_classes.dex
fi
if [ -r src-ex ]; then
@@ -43,3 +48,5 @@ if [ -r src-ex ]; then
mv classes-1.dex classes.dex
fi
fi
+
+zip $TEST_NAME.jar classes.dex