sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jack-updated: Bump version

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-02-18 00:48:01 +01:00
parent d6df138bb1
commit a27346012d
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
disabled-packages/jack-updated/build.sh
View File

@ -1,8 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://source.android.com/source/jack.html TERMUX_PKG_HOMEPAGE=https://source.android.com/source/jack.html
TERMUX_PKG_DESCRIPTION="Java Android Compiler Kit" TERMUX_PKG_DESCRIPTION="Java Android Compiler Kit"
# Use the date of the below git commit as the version number: # Use the date of the below git commit as the version number:
TERMUX_PKG_VERSION=20170201 TERMUX_PKG_VERSION=20170216
TERMUX_PKG_SRCURL=https://android.googlesource.com/toolchain/jack/+archive/bfe543d753a274a3aa696eafc9481cea67c73390.tar.gz _COMMIT=3626c3909d03c304b595a86a8a7700ac83ec4e95
TERMUX_PKG_SRCURL=https://android.googlesource.com/toolchain/jack/+archive/${_COMMIT}.tar.gz
TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_PLATFORM_INDEPENDENT=true
termux_step_extract_package() { 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: # 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} mkdir -p $TERMUX_PREFIX/share/{dex,jack}
local JACK_JACK=$TERMUX_PKG_TMPDIR/jack.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 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 cd $TERMUX_PKG_TMPDIR
rm -rf android-jar rm -rf android-jar

2
disabled-packages/jack-updated/jack.sh
View File

@ -7,7 +7,7 @@ done
exec dalvikvm -Xmx256m \ exec dalvikvm -Xmx256m \
-Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \ -Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \
-cp @TERMUX_PREFIX@/share/dex/jack.dex \ -cp @TERMUX_PREFIX@/share/dex/jack.jar \
com.android.jack.Main \ com.android.jack.Main \
-cp $CLASSPATH \ -cp $CLASSPATH \
-D jack.annotation-processor=off \ -D jack.annotation-processor=off \

19
disabled-packages/jack-updated/remove-findbugs-annotation.patch Normal file
View File

@ -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));