diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-08-09 23:49:40 +0200 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-08-10 14:45:41 +0200 |
commit | 178652c980bc6b0372511a449229cb81e19790bb (patch) | |
tree | d58d0bb7594e354a8274938cf1b74bbc7a713da5 | |
parent | 200b4b0d9c782fe1a0930f3384f675bed06d6c09 (diff) | |
download | toolchain_jack-178652c980bc6b0372511a449229cb81e19790bb.tar.gz toolchain_jack-178652c980bc6b0372511a449229cb81e19790bb.tar.bz2 toolchain_jack-178652c980bc6b0372511a449229cb81e19790bb.zip |
Revert "replace prebuilt ecj with ecj from Debian"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004replicant-6.0
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>
-rw-r--r-- | build.xml | 7 | ||||
-rw-r--r-- | ecj/ecj-4.5M7.jar | bin | 0 -> 2388762 bytes | |||
l--------- | ecj/ecj.jar | 1 | ||||
l--------- | ecj/org.eclipse.jdt.compiler.apt.jar | 1 |
4 files changed, 1 insertions, 8 deletions
@@ -194,7 +194,6 @@ <copy todir="${jack.libs.dir}" flatten="true"> <filelist dir="/" > <file name="${ecj.dist.dir}/${ecj.libname}"/> - <file name="${ecj.dist.dir}/${ecj_apt.libname}"/> <file name="${guava.dist.dir}/${guava.libname}"/> <file name="${dx.dist.dir}/${dx.libname}"/> <file name="${args4j.dist.dir}/${args4j.libname}"/> @@ -224,7 +223,6 @@ <filelist id="jack.static.libs.fileset" dir="/"> <file name="${jack-api.dist.dir}/${jack-api.lib.name}"/> <file name="${ecj.dist.dir}/${ecj.libname}" /> - <file name="${ecj.dist.dir}/${ecj_apt.libname}" /> <file name="${guava.dist.dir}/${guava.libname}" /> <file name="${jsr305.dist.dir}/${jsr305.libname}" /> <file name="${dx.dist.dir}/${dx.libname}" /> @@ -718,7 +716,6 @@ <file name="${dx-ref.dist.dir}/${dx-ref.libname}"/> <file name="${ddm-lib.dist.dir}/${ddm-lib.libname}"/> <file name="${ecj.dist.dir}/${ecj.libname}"/> - <file name="${ecj.dist.dir}/${ecj_apt.libname}"/> <file name="${antlr-rt.dist.dir}/${antlr-rt.libname}"/> <file name="${guava.dist.dir}/${guava.libname}"/> <file name="${dexlib.dist.dir}/${dexlib.libname}"/> @@ -943,7 +940,6 @@ <!-- ecj --> <!-- ******************* --> <property name="ecj.libname" value="ecj.jar"/> - <property name="ecj_apt.libname" value="ecj_apt.jar"/> <property name="ecj.dist.dir" value="${build-top.dir}/ecj/dist"/> <target name="ecj-clean"> @@ -952,8 +948,7 @@ <target name="ecj"> <mkdir dir="${ecj.dist.dir}"/> - <copy file="${ecj.dir}/ecj.jar" tofile="${ecj.dist.dir}/${ecj.libname}"/> - <copy file="${ecj.dir}/org.eclipse.jdt.compiler.apt.jar" tofile="${ecj.dist.dir}/${ecj_apt.libname}"/> + <copy file="${ecj.dir}/ecj-4.5M7.jar" tofile="${ecj.dist.dir}/${ecj.libname}"/> </target> diff --git a/ecj/ecj-4.5M7.jar b/ecj/ecj-4.5M7.jar Binary files differnew file mode 100644 index 00000000..c5af94e3 --- /dev/null +++ b/ecj/ecj-4.5M7.jar diff --git a/ecj/ecj.jar b/ecj/ecj.jar deleted file mode 120000 index 1e183e80..00000000 --- a/ecj/ecj.jar +++ /dev/null @@ -1 +0,0 @@ -/usr/share/java/ecj.jar
\ No newline at end of file diff --git a/ecj/org.eclipse.jdt.compiler.apt.jar b/ecj/org.eclipse.jdt.compiler.apt.jar deleted file mode 120000 index e03ebd3f..00000000 --- a/ecj/org.eclipse.jdt.compiler.apt.jar +++ /dev/null @@ -1 +0,0 @@ -/usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_1.0.500.dist.jar
\ No newline at end of file |