: ${TERMUX_DEBUG:=""}
: ${TERMUX_PROCESS_DEB:=""}
: ${TERMUX_API_LEVEL:="21"}
-: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.3"}
+: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="24.0.1"}
: ${TERMUX_NDK_VERSION:="12"}
# Handle command-line arguments:
# 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
# We put this after system PATH to avoid picking up toolchain stripped python
export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
TERMUX_PKG_HOMEPAGE=http://developer.android.com/tools/help/index.html
TERMUX_PKG_DESCRIPTION="Command which takes in class files and reformulates them for usage on Android"
TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION
-TERMUX_PKG_BUILD_REVISION=1
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
+ java -jar $TERMUX_JACK \
+ --output-dex $TERMUX_PKG_TMPDIR \
+ --import $DX_JACK
+
mkdir -p $TERMUX_PREFIX/share/dex
- $TERMUX_DX \
- --dex \
- --output=$TERMUX_PREFIX/share/dex/dx.jar \
- $ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/dx.jar
+ 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
exec dalvikvm \
-Xmx256m \
- -cp @TERMUX_PREFIX@/share/dex/dx.jar \
+ -cp @TERMUX_PREFIX@/share/dex/dx.dex \
com.android.dx.command.Main $@
# perhaps because BatchProcessingEnvImpl uses javax.tools which does not exist on android?
TERMUX_PKG_HOMEPAGE=http://tools.android.com/tech-docs/jackandjill
TERMUX_PKG_DESCRIPTION="Java Android Compiler Kit"
-TERMUX_PKG_VERSION="1.1-mr2"
-TERMUX_PKG_BUILD_REVISION=4
+TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION
TERMUX_PKG_PLATFORM_INDEPENDENT=true
termux_step_make () {
rm ndk.zip
fi
-echo y | $ANDROID_HOME/tools/android update sdk --no-ui --all --no-https -t "build-tools-23.0.3,android-23"
+echo y | $ANDROID_HOME/tools/android update sdk --no-ui --all --no-https -t "build-tools-24.0.1,android-23"