From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 17 Feb 2017 23:48:01 +0000 (+0100)
Subject: jack-updated: Bump version
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/a27346012df6282bc974aadb779ae9d32bea9226?ds=inline

jack-updated: Bump version
---

diff --git a/disabled-packages/jack-updated/build.sh b/disabled-packages/jack-updated/build.sh
index 016a3e8e..26a486bd 100755
--- a/disabled-packages/jack-updated/build.sh
+++ b/disabled-packages/jack-updated/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://source.android.com/source/jack.html
 TERMUX_PKG_DESCRIPTION="Java Android Compiler Kit"
 # Use the date of the below git commit as the version number:
-TERMUX_PKG_VERSION=20170201
-TERMUX_PKG_SRCURL=https://android.googlesource.com/toolchain/jack/+archive/bfe543d753a274a3aa696eafc9481cea67c73390.tar.gz
+TERMUX_PKG_VERSION=20170216
+_COMMIT=3626c3909d03c304b595a86a8a7700ac83ec4e95
+TERMUX_PKG_SRCURL=https://android.googlesource.com/toolchain/jack/+archive/${_COMMIT}.tar.gz
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
 termux_step_extract_package() {
@@ -26,11 +27,15 @@ termux_step_make () {
 	# 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}
 	local JACK_JACK=$TERMUX_PKG_TMPDIR/jack.jack
-	#java -jar $JILL_JAR --output=$JACK_JACK $JACK_JAR
-	#java -jar $JACK_JAR --output-dex $TERMUX_PKG_TMPDIR --import $JACK_JACK
 	java -jar $JACK_JAR --output-dex $TERMUX_PKG_TMPDIR --import $JACK_JAR
-	mv $TERMUX_PKG_TMPDIR/classes.dex $TERMUX_PREFIX/share/dex/jack.dex
-	#$TERMUX_DX -JXmx4096M --num-threads=4 --dex --output=$TERMUX_PREFIX/share/dex/jack.jar #$TERMUX_JACK
+
+	cp ./jill/gradle-build/jill-version.properties $TERMUX_PKG_TMPDIR/
+	cp ./jack/gradle-build/jack-version.properties $TERMUX_PKG_TMPDIR/
+	cd $TERMUX_PKG_TMPDIR
+	zip $TERMUX_PREFIX/share/dex/jack.jar \
+		jill-version.properties \
+		jack-version.properties \
+		classes.dex
 
 	cd $TERMUX_PKG_TMPDIR
 	rm -rf android-jar
diff --git a/disabled-packages/jack-updated/jack.sh b/disabled-packages/jack-updated/jack.sh
index 88b4b520..284556a4 100755
--- a/disabled-packages/jack-updated/jack.sh
+++ b/disabled-packages/jack-updated/jack.sh
@@ -7,7 +7,7 @@ done
 
 exec dalvikvm -Xmx256m \
  -Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \
- -cp @TERMUX_PREFIX@/share/dex/jack.dex \
+ -cp @TERMUX_PREFIX@/share/dex/jack.jar \
  com.android.jack.Main \
  -cp $CLASSPATH \
  -D jack.annotation-processor=off \
diff --git a/disabled-packages/jack-updated/remove-findbugs-annotation.patch b/disabled-packages/jack-updated/remove-findbugs-annotation.patch
new file mode 100644
index 00000000..f1f3780f
--- /dev/null
+++ b/disabled-packages/jack-updated/remove-findbugs-annotation.patch
@@ -0,0 +1,19 @@
+diff -u -r ../pristine/sched/src/com/android/sched/build/SchedAnnotationProcessor.java ./sched/src/com/android/sched/build/SchedAnnotationProcessor.java
+--- ../pristine/sched/src/com/android/sched/build/SchedAnnotationProcessor.java	2017-02-17 23:55:50.000000000 +0100
++++ ./sched/src/com/android/sched/build/SchedAnnotationProcessor.java	2017-02-18 00:00:44.231965307 +0100
+@@ -16,7 +16,6 @@
+ 
+ package com.android.sched.build;
+ 
+-import com.android.sched.util.findbugs.SuppressFBWarnings;
+ 
+ import java.io.BufferedReader;
+ import java.io.IOException;
+@@ -101,7 +100,6 @@
+     FILTER("com.android.sched.schedulable.ComponentFilter") {
+       @Override
+       @Nonnull
+-      @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE") // probably a FindBugs bug
+       public TypeMirror getTypeMirror() throws AbortException {
+         return env.getTypeUtils().getDeclaredType(getTypeElement(),
+             env.getTypeUtils().getWildcardType(null, null));