jack: Try to find right lib folder

This commit is contained in:
Fredrik Fornwall 2015-12-19 17:49:36 -05:00
parent 6bbba8f22a
commit b5661c0177
2 changed files with 10 additions and 2 deletions

View File

@ -4,7 +4,7 @@
TERMUX_PKG_HOMEPAGE=http://tools.android.com/tech-docs/jackandjill TERMUX_PKG_HOMEPAGE=http://tools.android.com/tech-docs/jackandjill
TERMUX_PKG_DESCRIPTION="Java Android Compiler Kit" TERMUX_PKG_DESCRIPTION="Java Android Compiler Kit"
TERMUX_PKG_VERSION="1.1-mr2" TERMUX_PKG_VERSION="1.1-mr2"
TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_BUILD_REVISION=2
TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_PLATFORM_INDEPENDENT=true
termux_step_make () { termux_step_make () {

View File

@ -4,7 +4,15 @@
export ANDROID_DATA=@TERMUX_PREFIX@/var/android/ export ANDROID_DATA=@TERMUX_PREFIX@/var/android/
mkdir -p $ANDROID_DATA/dalvik-cache mkdir -p $ANDROID_DATA/dalvik-cache
LD_LIBRARY_PATH=/system/lib \ # Find the right lib folder for dalvikvm. We cannot take LD_LIBRARY_PATH
# as is since it contains Termux-supplied libraries which may clash with
# system ones.
LIBFOLDER=/system/lib
if test -d /system/lib64; then
LIBFOLDER=/system/lib64
fi
LD_LIBRARY_PATH=$LIBFOLDER \
exec dalvikvm -Xmx256m \ exec dalvikvm -Xmx256m \
-Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \ -Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \
-cp @TERMUX_PREFIX@/share/dex/jack.jar com.android.jack.Main \ -cp @TERMUX_PREFIX@/share/dex/jack.jar com.android.jack.Main \