Fix dalvikvm wrapper

- Just unset LD_LIBRARY_PATH in the dalvikvm wrapper.
- Let the dalvikvm wrapper setup $ANDROID_DATA.
- Avoid using a custom dalvikvm wrapper in dx.

diff --git a/packages/dx/build.sh b/packages/dx/build.sh
index c70533ad04aa495a9f608796fbca85b9ab227c1f..411b7a2adf516644b28ff1fc77d06dbcb4fe1c0e 100755 (executable)
--- a/packages/dx/build.sh
+++ b/packages/dx/build.sh
@@ -1,6 +1,7 @@
 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 () {
@@ -11,6 +12,5 @@ termux_step_make_install () {
                 $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/dalvikvm-wrapper $TERMUX_PREFIX/bin/dalvikvm-wrapper
-       perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/{dx,dalvikvm-wrapper}
+       perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/dx
 }

diff --git a/packages/dx/dalvikvm-wrapper b/packages/dx/dalvikvm-wrapper
deleted file mode 100755 (executable)
index 4b29585..0000000
--- a/packages/dx/dalvikvm-wrapper
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# There needs to be a folder at $ANDROID_DATA/dalvik-cache:
-export ANDROID_DATA=@TERMUX_PREFIX@/var/android/
-mkdir -p $ANDROID_DATA/dalvik-cache
-
-# Reset LD_LIBRARY_PATH to avoid shared library clashes:
-LD_LIBRARY_PATH=/system/lib dalvikvm $@

diff --git a/packages/dx/dx b/packages/dx/dx
index b307736cf286cfcb9b37a4c39b8a97f80c507555..242feb268b2712aa885bafa5fb89b01da96a02f0 100755 (executable)
--- a/packages/dx/dx
+++ b/packages/dx/dx
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-dalvikvm-wrapper
+exec dalvikvm \
        -Xmx256m \
        -cp @TERMUX_PREFIX@/share/dex/dx.jar \
        com.android.dx.command.Main $@

diff --git a/packages/ecj/ecj b/packages/ecj/ecj
index f62fe7623fc9f2b6faa4a7dc347fcf5150a459d4..994c349c98aaefe01369a1884c85bab8cc90407f 100755 (executable)
--- a/packages/ecj/ecj
+++ b/packages/ecj/ecj
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-# There needs to be a folder at $ANDROID_DATA/dalvik-cache
-export ANDROID_DATA=@TERMUX_PREFIX@/var/android/
-mkdir -p $ANDROID_DATA/dalvik-cache
-
-jarpath=@TERMUX_PREFIX@/share/dex/ecj.jar
-# -proc:none to disable annotation processing/compiling
-# -7 for java 1.7 compatibility
-dalvikvm -Xmx256m -cp $jarpath org.eclipse.jdt.internal.compiler.batch.Main -proc:none -7 -cp @TERMUX_PREFIX@/share/java/android.jar $@
+# -proc:none to disable annotation processing.
+# -7 for java 1.7 compatibility.
+dalvikvm -Xmx256m \
+         -cp @TERMUX_PREFIX@/share/dex/ecj.jar
+         org.eclipse.jdt.internal.compiler.batch.Main \
+         -proc:none \
+         -7 \
+         -cp @TERMUX_PREFIX@/share/java/android.jar \
+         $@

diff --git a/packages/jack/build.sh b/packages/jack/build.sh
index 8405393f18ecbedb26e06a50dcb00987e8404e19..a83c739dd15fc4ba9c0a96b996bdc99a27c21f7d 100755 (executable)
--- a/packages/jack/build.sh
+++ b/packages/jack/build.sh
@@ -4,7 +4,7 @@
 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_BUILD_REVISION=4
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
 termux_step_make () {

diff --git a/packages/jack/jack.sh b/packages/jack/jack.sh
index db43657c02adc067618c3fb3e989d5d05fe9810a..0be3d65c11174eca700ed8ca5de12ca297f27b22 100755 (executable)
--- a/packages/jack/jack.sh
+++ b/packages/jack/jack.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-# There needs to be a folder at $ANDROID_DATA/dalvik-cache
-export ANDROID_DATA=@TERMUX_PREFIX@/var/android/
-mkdir -p $ANDROID_DATA/dalvik-cache
-
 exec dalvikvm -Xmx256m \
 -Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \
 -cp @TERMUX_PREFIX@/share/dex/jack.jar com.android.jack.Main \

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index 47144ebacb016f806292246d50a2a0efc57eb96f..04048e93899840c4bbc84167457701de0a2061ae 100644 (file)
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,12 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://termux.com/
 TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
-TERMUX_PKG_VERSION=0.27
+TERMUX_PKG_VERSION=0.28
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
 termux_step_make_install () {
        # Remove LD_LIBRARY_PATH from environment to avoid conflicting
        # with system libraries that am may link against.
-       for tool in am dalvikvm df getprop logcat ping ping6 ip pm settings; do
+       for tool in am df getprop logcat ping ping6 ip pm settings; do
                WRAPPER_FILE=$TERMUX_PREFIX/bin/$tool
                echo '#!/bin/sh' > $WRAPPER_FILE
 
@@ -22,5 +22,6 @@ termux_step_make_install () {
                chmod +x $TERMUX_PREFIX/bin/$tool
        done
 
-       cp -p $TERMUX_PKG_BUILDER_DIR/{su,termux-fix-shebang,termux-reload-settings,termux-setup-storage,chsh,termux-open-url} $TERMUX_PREFIX/bin/
+       cp -p $TERMUX_PKG_BUILDER_DIR/{dalvikvm,su,termux-fix-shebang,termux-reload-settings,termux-setup-storage,chsh,termux-open-url} $TERMUX_PREFIX/bin/
+       perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/dalvikvm
 }

diff --git a/packages/termux-tools/dalvikvm b/packages/termux-tools/dalvikvm
new file mode 100755 (executable)
index 0000000..bd36acf
--- /dev/null
+++ b/packages/termux-tools/dalvikvm
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# There needs to be a folder at $ANDROID_DATA/dalvik-cache
+export ANDROID_DATA=@TERMUX_PREFIX@/var/android/
+mkdir -p $ANDROID_DATA/dalvik-cache
+
+unset LD_LIBRARY_PATH
+exec /system/bin/dalvikvm -Djava.io.tmpdir=@TERMUX_PREFIX@/tmp "$@"