openssl: Update from 1.0.2l to 1.0.2m

[termux-packages] / packages / dx / build.sh

diff --git a/packages/dx/build.sh b/packages/dx/build.sh
index 10771d9..d39d13d 100755 (executable)
--- a/packages/dx/build.sh
+++ b/packages/dx/build.sh
@@ -4,15 +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 use jack:
-       java -jar $TERMUX_JACK \
-               --output-dex $TERMUX_PKG_TMPDIR \
-               --import $ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/dx.jar
-
        mkdir -p $TERMUX_PREFIX/share/dex
-       mv $TERMUX_PKG_TMPDIR/classes.dex $TERMUX_PREFIX/share/dex/dx.dex
+       $TERMUX_DX --dex \
+               --output $TERMUX_PREFIX/share/dex/dx.dex \
+               $ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/dx.jar
 
        install $TERMUX_PKG_BUILDER_DIR/dx $TERMUX_PREFIX/bin/dx
        perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/dx