summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.xml2
-rw-r--r--ecj/Android.mk2
-rw-r--r--ecj/README.android8
-rw-r--r--ecj/ecj-4.4M5.jarbin0 -> 1913808 bytes
-rw-r--r--ecj/ecj-4.5M1.jarbin2305523 -> 0 bytes
-rw-r--r--jack/src/com/android/jack/ecj/loader/jast/JAstBinaryField.java6
-rw-r--r--jack/src/com/android/jack/ecj/loader/jast/JAstBinaryMethod.java6
-rw-r--r--jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java6
8 files changed, 8 insertions, 22 deletions
diff --git a/build.xml b/build.xml
index 41178624..50b8f385 100644
--- a/build.xml
+++ b/build.xml
@@ -393,7 +393,7 @@
<target name="ecj">
<mkdir dir="${ecj.dist.dir}"/>
- <copy file="${ecj.dir}/ecj-4.5M1.jar" tofile="${ecj.dist.dir}/${ecj.libname}"/>
+ <copy file="${ecj.dir}/ecj-4.4M5.jar" tofile="${ecj.dist.dir}/${ecj.libname}"/>
</target>
diff --git a/ecj/Android.mk b/ecj/Android.mk
index 53f6075e..3bb58155 100644
--- a/ecj/Android.mk
+++ b/ecj/Android.mk
@@ -19,6 +19,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ecj-jack:ecj-4.5M1$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ecj-jack:ecj-4.4M5$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/ecj/README.android b/ecj/README.android
index 4e0d5f61..f0f1e929 100644
--- a/ecj/README.android
+++ b/ecj/README.android
@@ -1,6 +1,10 @@
-URL: http://download.eclipse.org/eclipse/downloads/drops4/S-4.5M1-201408062000/
-Tag: I20140806-2000, jdt 4.5M1, ecj version 3.11.0.v20140806-1653
+URL: http://download.eclipse.org/eclipse/downloads/drops4/S-4.4M5-201401231600/
+Tag: I20140123-1600, jdt 4.4M5, ecj version 3.10.0
License: EPL 1
Description: An incremental Java compiler.
Local Modifications: None.
+Commit c660a0e6a2551567fa3f92ffe31ef9b52fdec6cc
+from branch master
+at http://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git
+
diff --git a/ecj/ecj-4.4M5.jar b/ecj/ecj-4.4M5.jar
new file mode 100644
index 00000000..c28ee3bf
--- /dev/null
+++ b/ecj/ecj-4.4M5.jar
Binary files differ
diff --git a/ecj/ecj-4.5M1.jar b/ecj/ecj-4.5M1.jar
deleted file mode 100644
index 24c0db1e..00000000
--- a/ecj/ecj-4.5M1.jar
+++ /dev/null
Binary files differ
diff --git a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryField.java b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryField.java
index 6f6e335c..172aeba4 100644
--- a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryField.java
+++ b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryField.java
@@ -22,7 +22,6 @@ import com.android.jack.ir.ast.JModifier;
import org.eclipse.jdt.internal.compiler.env.IBinaryAnnotation;
import org.eclipse.jdt.internal.compiler.env.IBinaryField;
-import org.eclipse.jdt.internal.compiler.env.IBinaryTypeAnnotation;
import org.eclipse.jdt.internal.compiler.impl.Constant;
import javax.annotation.CheckForNull;
@@ -119,9 +118,4 @@ class JAstBinaryField implements IBinaryField {
public String toString() {
return jField.toString();
}
-
- @Override
- public IBinaryTypeAnnotation[] getTypeAnnotations() {
- return null;
- }
}
diff --git a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryMethod.java b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryMethod.java
index 253dedf4..cf9f8d2c 100644
--- a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryMethod.java
+++ b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryMethod.java
@@ -31,7 +31,6 @@ import com.android.jack.ir.formatter.TypeFormatter;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.eclipse.jdt.internal.compiler.env.IBinaryAnnotation;
import org.eclipse.jdt.internal.compiler.env.IBinaryMethod;
-import org.eclipse.jdt.internal.compiler.env.IBinaryTypeAnnotation;
import java.util.List;
@@ -249,9 +248,4 @@ class JAstBinaryMethod implements IBinaryMethod {
}
return result;
}
-
- @Override
- public IBinaryTypeAnnotation[] getTypeAnnotations() {
- return null;
- }
}
diff --git a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java
index 2706c78a..1ca12777 100644
--- a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java
+++ b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java
@@ -42,7 +42,6 @@ import org.eclipse.jdt.internal.compiler.env.IBinaryField;
import org.eclipse.jdt.internal.compiler.env.IBinaryMethod;
import org.eclipse.jdt.internal.compiler.env.IBinaryNestedType;
import org.eclipse.jdt.internal.compiler.env.IBinaryType;
-import org.eclipse.jdt.internal.compiler.env.IBinaryTypeAnnotation;
import org.eclipse.jdt.internal.compiler.lookup.ExtraCompilerModifiers;
import java.util.ArrayList;
@@ -437,9 +436,4 @@ class JAstBinaryType implements IBinaryType {
return enclosingMethodName;
}
-
- @Override
- public IBinaryTypeAnnotation[] getTypeAnnotations() {
- return null;
- }
}