X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/392b4b6ba54509fe9cd58a8902f1196acb096e26..5e927b658d3f3a2176af1090b92fe7f5aa400912:/packages/ecj/build.sh

diff --git a/packages/ecj/build.sh b/packages/ecj/build.sh
index 1353dcaf..0af38a8a 100755
--- a/packages/ecj/build.sh
+++ b/packages/ecj/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.eclipse.org/jdt/core/
 TERMUX_PKG_DESCRIPTION="Eclipse Compiler for Java"
 TERMUX_PKG_VERSION=4.6.2
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=http://eclipse.mirror.wearetriple.com/eclipse/downloads/drops4/R-4.6.2-201611241400/ecj-4.6.2.jar
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
@@ -31,20 +31,22 @@ termux_step_make () {
 	cp $ANDROID_HOME/platforms/android-27/android.jar .
 	unzip -q android.jar
 	rm -Rf android.jar resources.arsc res assets
-	zip -q -r android.jar .
+	jar cfM android.jar .
 
 	cp $TERMUX_PKG_TMPDIR/android-jar/android.jar $TERMUX_PREFIX/share/java/android.jar
 
 	# Bundle in an android.jar from an older API also, for those who want to
 	# build apps that run on older Android versions.
 	rm -Rf ./*
-	cp $ANDROID_HOME/platforms/android-16/android.jar android.jar
+	cp $ANDROID_HOME/platforms/android-21/android.jar android.jar
 	unzip -q android.jar
 	rm -Rf android.jar resources.arsc res assets
-	zip -q -r android-16.jar .
-	cp $TERMUX_PKG_TMPDIR/android-jar/android-16.jar $TERMUX_PREFIX/share/java/
+	jar cfM android-21.jar .
+	cp $TERMUX_PKG_TMPDIR/android-jar/android-21.jar $TERMUX_PREFIX/share/java/
 
 	rm -Rf $TERMUX_PREFIX/bin/javac
 	install $TERMUX_PKG_BUILDER_DIR/ecj $TERMUX_PREFIX/bin/ecj
 	perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/ecj
+	install $TERMUX_PKG_BUILDER_DIR/ecj-21 $TERMUX_PREFIX/bin/ecj-21
+	perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/ecj-21
 }