mirror of
https://github.com/termux/termux-packages
synced 2024-06-14 17:06:38 +00:00
Remove TERMUX_JACK and TERMUX_JILL
This commit is contained in:
parent
3b6c86e870
commit
9c357bef30
|
@ -280,8 +280,6 @@ termux_step_setup_variables() {
|
||||||
# to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
|
# to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
|
||||||
# the standalone toolchain.
|
# the standalone toolchain.
|
||||||
TERMUX_DX=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx
|
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_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache"
|
||||||
TERMUX_DEBDIR="$TERMUX_SCRIPTDIR/debs"
|
TERMUX_DEBDIR="$TERMUX_SCRIPTDIR/debs"
|
||||||
|
|
|
@ -4,15 +4,10 @@ TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION
|
||||||
TERMUX_PKG_PLATFORM_INDEPENDENT=true
|
TERMUX_PKG_PLATFORM_INDEPENDENT=true
|
||||||
|
|
||||||
termux_step_make_install () {
|
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
|
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
|
install $TERMUX_PKG_BUILDER_DIR/dx $TERMUX_PREFIX/bin/dx
|
||||||
perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/dx
|
perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/dx
|
||||||
|
|
Loading…
Reference in New Issue
Block a user