From 2cbdeb5e714701630773b7d1b136a85fbc598e6b Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 26 Jul 2016 08:55:25 -0400
Subject: [PATCH] jack: Clean up build

---
 packages/jack/build.sh | 12 +++++-------
 packages/jack/jack.sh  | 15 +++++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/jack/build.sh b/packages/jack/build.sh
index 4dfb4cfbd..104a162ca 100755
--- a/packages/jack/build.sh
+++ b/packages/jack/build.sh
@@ -7,15 +7,13 @@ TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
 termux_step_make () {
-	JACK_JAR=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jack.jar
-	JILL_JAR=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jill.jar
-
 	# 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}
 	$TERMUX_DX \
+		-JXmx4096M --num-threads=4 \
 		--dex \
 		--output=$TERMUX_PREFIX/share/dex/jack.jar \
-		$JACK_JAR
+		$TERMUX_JACK
 
 	cd $TERMUX_PKG_TMPDIR
 	rm -rf android-jar
@@ -25,11 +23,11 @@ termux_step_make () {
         # We need the android.jar clases in jill format (.jack extension) for jack to compile against.
 	cp $ANDROID_HOME/platforms/android-23/android.jar .
 	# Remove resources not needed for compilation to reduce size:
-	unzip android.jar
+	unzip -q android.jar
 	rm -Rf android.jar resources.arsc res assets
-	zip -r android.jar .
+	zip -r -q android.jar .
 
-	java -jar $JILL_JAR $TERMUX_PKG_TMPDIR/android-jar/android.jar --output $TERMUX_PREFIX/share/jack/android.jack
+	java -jar $TERMUX_JILL $TERMUX_PKG_TMPDIR/android-jar/android.jar --output $TERMUX_PREFIX/share/jack/android.jack
 	mkdir -p $TERMUX_PREFIX/bin
 	install $TERMUX_PKG_BUILDER_DIR/jack.sh $TERMUX_PREFIX/bin/jack
 	perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/jack
diff --git a/packages/jack/jack.sh b/packages/jack/jack.sh
index 0be3d65c1..f0a50a884 100755
--- a/packages/jack/jack.sh
+++ b/packages/jack/jack.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 
 exec dalvikvm -Xmx256m \
--Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \
--cp @TERMUX_PREFIX@/share/dex/jack.jar com.android.jack.Main \
--cp @TERMUX_PREFIX@/share/jack/android.jack \
--D jack.library.digest.algo=MD5 -D sched.vfs.case-insensitive.algo=MD5 \
--D jack.annotation-processor=off \
---output-dex=`pwd` \
+ -Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \
+ -cp @TERMUX_PREFIX@/share/dex/jack.jar \
+ com.android.jack.Main \
+ -cp @TERMUX_PREFIX@/share/jack/android.jack \
+ -D jack.library.digest.algo=MD5 \
+ -D jack.source.digest.algo=MD5 \
+ -D sched.vfs.case-insensitive.algo=MD5 \
+ -D jack.annotation-processor=off \
+ --output-dex=`pwd` \
 $@