summaryrefslogtreecommitdiffstats
path: root/test/097-duplicate-method
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2016-01-19 17:07:18 +0100
committerYohann Roussel <yroussel@google.com>2016-02-16 15:25:53 +0100
commitaaa779a0a5f7afc23814728de68c6fe3ae1450bf (patch)
tree401f118681d9c5a0f3b1cbb599eebb321e354c78 /test/097-duplicate-method
parent7eca244e79480f2ecea341598524a53273959c2b (diff)
downloadart-aaa779a0a5f7afc23814728de68c6fe3ae1450bf.tar.gz
art-aaa779a0a5f7afc23814728de68c6fe3ae1450bf.tar.bz2
art-aaa779a0a5f7afc23814728de68c6fe3ae1450bf.zip
Remove usages of jill.jar, use jack instead
Change-Id: Icb403ee6fb5bf287d2b72bb253b683b1d95f4e07
Diffstat (limited to 'test/097-duplicate-method')
-rw-r--r--test/097-duplicate-method/build4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/097-duplicate-method/build b/test/097-duplicate-method/build
index a8558739de..4525549905 100644
--- a/test/097-duplicate-method/build
+++ b/test/097-duplicate-method/build
@@ -23,10 +23,10 @@ if [ ${USE_JACK} = "true" ]; then
${JACK} --output-jack src.jack src
${JASMIN} -d classes src/*.j
- ${JILL} classes --output jasmin.jack
+ jar cf jasmin.jill.jar -C classes .
# We set jack.import.type.policy=keep-first to consider class definitions from jasmin first.
- ${JACK} --import jasmin.jack --import src.jack -D jack.import.type.policy=keep-first --output-dex .
+ ${JACK} --import jasmin.jill.jar --import src.jack -D jack.import.type.policy=keep-first --output-dex .
else
${JAVAC} -d classes src/*.java
${JASMIN} -d classes src/*.j