From 476637ac146a154903bd8eac67e20467ebcff91a Mon Sep 17 00:00:00 2001
From: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Date: Sun, 11 Dec 2016 22:16:28 +0100
Subject: replace prebuilt ecj with ecj from Debian

works on Debian Stretch

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
---
 build.xml                            |   7 ++++++-
 ecj/ecj-4.5M7.jar                    | Bin 2388762 -> 0 bytes
 ecj/ecj.jar                          |   1 +
 ecj/org.eclipse.jdt.compiler.apt.jar |   1 +
 4 files changed, 8 insertions(+), 1 deletion(-)
 delete mode 100644 ecj/ecj-4.5M7.jar
 create mode 120000 ecj/ecj.jar
 create mode 120000 ecj/org.eclipse.jdt.compiler.apt.jar

diff --git a/build.xml b/build.xml
index 7e9ce6d..d4bac91 100644
--- a/build.xml
+++ b/build.xml
@@ -194,6 +194,7 @@
     <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}"/>
@@ -223,6 +224,7 @@
     <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}" />
@@ -716,6 +718,7 @@
         <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}"/>
@@ -940,6 +943,7 @@
   <!-- 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">
@@ -948,7 +952,8 @@
 
   <target name="ecj">
     <mkdir dir="${ecj.dist.dir}"/>
-    <copy file="${ecj.dir}/ecj-4.5M7.jar" tofile="${ecj.dist.dir}/${ecj.libname}"/>
+    <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}"/>
   </target>
 
 
diff --git a/ecj/ecj-4.5M7.jar b/ecj/ecj-4.5M7.jar
deleted file mode 100644
index c5af94e..0000000
Binary files a/ecj/ecj-4.5M7.jar and /dev/null differ
diff --git a/ecj/ecj.jar b/ecj/ecj.jar
new file mode 120000
index 0000000..1e183e8
--- /dev/null
+++ b/ecj/ecj.jar
@@ -0,0 +1 @@
+/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
new file mode 120000
index 0000000..e03ebd3
--- /dev/null
+++ b/ecj/org.eclipse.jdt.compiler.apt.jar
@@ -0,0 +1 @@
+/usr/share/eclipse/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_1.0.500.dist.jar
\ No newline at end of file
-- 
cgit v1.1