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

diff --git a/packages/dx/build.sh b/packages/dx/build.sh
index a225d132..d39d13dd 100755
--- a/packages/dx/build.sh
+++ b/packages/dx/build.sh
@@ -4,19 +4,10 @@ TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION
 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 \
+	mkdir -p $TERMUX_PREFIX/share/dex
+	$TERMUX_DX --dex \
+		--output $TERMUX_PREFIX/share/dex/dx.dex \
 		$ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/dx.jar
-	java -jar $TERMUX_JACK \
-		--output-dex $TERMUX_PKG_TMPDIR \
-		--import $DX_JACK
-
-        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
 	perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/dx