Update ecj to 4.5M1 version

Reapply 0e14321c580b9a1d11fbbd7feb1922a697fcf55f

Change-Id: I39ea15a80eb33fced705516cd2150386a5a54d51

8 files changed, 22 insertions, 8 deletions

diff --git a/build.xml b/build.xml
index 50b8f38..4117862 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.4M5.jar" tofile="${ecj.dist.dir}/${ecj.libname}"/>
+    <copy file="${ecj.dir}/ecj-4.5M1.jar" tofile="${ecj.dist.dir}/${ecj.libname}"/>
   </target>
 
 
diff --git a/ecj/Android.mk b/ecj/Android.mk
index 3bb5815..53f6075 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.4M5$(COMMON_JAVA_PACKAGE_SUFFIX)
+	ecj-jack:ecj-4.5M1$(COMMON_JAVA_PACKAGE_SUFFIX)
 
 include $(BUILD_HOST_PREBUILT)
diff --git a/ecj/README.android b/ecj/README.android
index f0f1e92..4e0d5f6 100644
--- a/ecj/README.android
+++ b/ecj/README.android
@@ -1,10 +1,6 @@
-URL: http://download.eclipse.org/eclipse/downloads/drops4/S-4.4M5-201401231600/
-Tag: I20140123-1600, jdt 4.4M5, ecj version 3.10.0
+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
 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
deleted file mode 100644
index c28ee3b..0000000
--- a/ecj/ecj-4.4M5.jar
+++ /dev/null
diff --git a/ecj/ecj-4.5M1.jar b/ecj/ecj-4.5M1.jar
new file mode 100644
index 0000000..24c0db1
--- /dev/null
+++ b/ecj/ecj-4.5M1.jar
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 172aeba..6f6e335 100644
--- a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryField.java
+++ b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryField.java
@@ -22,6 +22,7 @@ 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;
@@ -118,4 +119,9 @@ 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 cf9f8d2..253dedf 100644
--- a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryMethod.java
+++ b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryMethod.java
@@ -31,6 +31,7 @@ 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;
 
@@ -248,4 +249,9 @@ 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 e42ae3e..e8a06ba 100644
--- a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java
+++ b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java
@@ -42,6 +42,7 @@ 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,4 +438,9 @@ class JAstBinaryType implements IBinaryType {
 
     return enclosingMethodName;
   }
+
+  @Override
+  public IBinaryTypeAnnotation[] getTypeAnnotations() {
+    return null;
+  }
 }