X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/382cfb780ca9a40f80e3932544bd32aeccb66e5a..295241d4043c55a41259b4846464e1668b2f6a5f:/packages/dx/build.sh

diff --git a/packages/dx/build.sh b/packages/dx/build.sh
index a225d132..10771d9a 100755
--- a/packages/dx/build.sh
+++ b/packages/dx/build.sh
@@ -6,16 +6,12 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true
 termux_step_make_install () {
 	# As of build tools 24 the dx tool is implemented using java 8, but
 	# as dx itself does not support java 8 (class file format 52)
-	# we go the .class -> jill -> jack route.
-	local DX_JACK=$TERMUX_PKG_TMPDIR/dx.jack
-	java -jar $TERMUX_JILL \
-		--output=$DX_JACK \
-		$ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/dx.jar
+	# we use jack:
 	java -jar $TERMUX_JACK \
 		--output-dex $TERMUX_PKG_TMPDIR \
-		--import $DX_JACK
+		--import $ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/dx.jar
 
-        mkdir -p $TERMUX_PREFIX/share/dex
+	mkdir -p $TERMUX_PREFIX/share/dex
 	mv $TERMUX_PKG_TMPDIR/classes.dex $TERMUX_PREFIX/share/dex/dx.dex
 
 	install $TERMUX_PKG_BUILDER_DIR/dx $TERMUX_PREFIX/bin/dx