From dab4f215c82efd88da9a23cec859e89130e0f1eb Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 11 Aug 2017 14:21:05 +0200 Subject: [PATCH] Remove TERMUX_JACK and TERMUX_JILL --- build-package.sh | 2 -- packages/dx/build.sh | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/build-package.sh b/build-package.sh index 53287d5a..9018f069 100755 --- a/build-package.sh +++ b/build-package.sh @@ -280,8 +280,6 @@ termux_step_setup_variables() { # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from # the standalone toolchain. TERMUX_DX=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx - TERMUX_JACK=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jack.jar - TERMUX_JILL=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jill.jar TERMUX_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache" TERMUX_DEBDIR="$TERMUX_SCRIPTDIR/debs" diff --git a/packages/dx/build.sh b/packages/dx/build.sh index 10771d9a..d39d13dd 100755 --- 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 -- 2.11.0