X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/202a1fb5d3efb4affe66cabc1f5ed33de0db1d80..382cfb780ca9a40f80e3932544bd32aeccb66e5a:/packages/jack/build.sh?ds=inline diff --git a/packages/jack/build.sh b/packages/jack/build.sh index 35584fd6..4dfb4cfb 100755 --- a/packages/jack/build.sh +++ b/packages/jack/build.sh @@ -3,8 +3,7 @@ # 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=3 +TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make () { @@ -13,7 +12,7 @@ termux_step_make () { # Create $USR/share/dex for dex files, and $USR/share/jack for .jack library files produced by jill: mkdir -p $TERMUX_PREFIX/share/{dex,jack} - $ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx \ + $TERMUX_DX \ --dex \ --output=$TERMUX_PREFIX/share/dex/jack.jar \ $JACK_JAR @@ -24,7 +23,7 @@ termux_step_make () { cd android-jar # We need the android.jar clases in jill format (.jack extension) for jack to compile against. - cp $ANDROID_HOME/platforms/android-21/android.jar . + cp $ANDROID_HOME/platforms/android-23/android.jar . # Remove resources not needed for compilation to reduce size: unzip android.jar rm -Rf android.jar resources.arsc res assets