This reverts commit 117dba7d6b317ddb608c1a568e013fe7ab946193.
Without that fix, the build fails in Trisquel 9 with the following error:
jack-lib-compile-step2:
[javac] Compiling 985 source files to
[...]/toolchain/jack_jill/build/jack/build/jack-lib/classes
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/frontend/java/JackBatchCompiler.java:147:
error: incompatible types: ArrayList<ClasspathLocation> cannot be converted to
ArrayList<Classpath>
[javac] super.addNewEntry(tmpPaths,
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryMethod.java:44:
error: JAstBinaryMethod is not abstract and does not override abstract method
getParameterAnnotations(int,char[]) in IBinaryMethod
[javac] class JAstBinaryMethod implements IBinaryMethod {
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryMethod.java:200:
error: method does not override or implement a method from a supertype
[javac] @Override
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java:59:
error: JAstBinaryType is not abstract and does not override abstract method
getExternalAnnotationStatus() in IBinaryType
[javac] class JAstBinaryType implements IBinaryType {
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java:44:
error: JAstClasspath is not abstract and does not override abstract method
fetchLinkedJars(ClasspathSectionProblemReporter) in Classpath
[javac] public class JAstClasspath extends ClasspathLocation {
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java:142:
error: fetchLinkedJars(ClasspathSectionProblemReporter) in JAstClasspath
cannot implement fetchLinkedJars(ClasspathSectionProblemReporter) in Classpath
[javac] public List<? extends Classpath> fetchLinkedJars(
[javac] ^
[javac] return type List<? extends Classpath> is not compatible with List<Classpath>
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java:65:
error: method does not override or implement a method from a supertype
[javac] @Override
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java:75:
error: method does not override or implement a method from a supertype
[javac] @Override
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java:87:
error: method does not override or implement a method from a supertype
[javac] @Override
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java:130:
error: method does not override or implement a method from a supertype
[javac] @Override
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java:141:
error: method does not override or implement a method from a supertype
[javac] @Override
[javac] ^
[javac] [...]/toolchain/src/jack/jack/src/com/android/jack/frontend/java/EcjLogger.java:77:
error: method does not override or implement a method from a supertype
[javac] @Override
[javac] ^
[javac] Note: Some input files use unchecked or unsafe operations.
[javac] Note: Recompile with -Xlint:unchecked for details.
[javac] Note: Some messages have been simplified; recompile with -Xdiags:verbose to get full output
[javac] 12 errors
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>