From 024c695f64424de40960430a2869cb88c5ec5994 Mon Sep 17 00:00:00 2001 From: mikaelpeltier Date: Tue, 12 May 2015 09:15:05 +0200 Subject: Update Ecj to 4.5M7 Change-Id: If63eaaf5dda587d3cd1d19a7adcaf3c3ee5d2501 --- build.xml | 2 +- ecj/Android.mk | 2 +- ecj/README.android | 4 ++-- ecj/ecj-4.5M1.jar | Bin 2305523 -> 0 bytes ecj/ecj-4.5M7.jar | Bin 0 -> 2388762 bytes .../android/jack/ecj/loader/jast/JAstBinaryType.java | 9 +++++++++ .../android/jack/ecj/loader/jast/JAstClasspath.java | 6 ++++++ 7 files changed, 19 insertions(+), 4 deletions(-) delete mode 100644 ecj/ecj-4.5M1.jar create mode 100644 ecj/ecj-4.5M7.jar diff --git a/build.xml b/build.xml index 2567e89..7e9ce6d 100644 --- a/build.xml +++ b/build.xml @@ -948,7 +948,7 @@ - + diff --git a/ecj/Android.mk b/ecj/Android.mk index 53f6075..c1993b9 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.5M7$(COMMON_JAVA_PACKAGE_SUFFIX) include $(BUILD_HOST_PREBUILT) diff --git a/ecj/README.android b/ecj/README.android index 4e0d5f6..3b48b74 100644 --- a/ecj/README.android +++ b/ecj/README.android @@ -1,5 +1,5 @@ -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.5M7-201504301445/ +Tag: I20150430-1445, jdt 4.5M7, ecj version 3.11.0.v20150429-0810 License: EPL 1 Description: An incremental Java compiler. Local Modifications: None. diff --git a/ecj/ecj-4.5M1.jar b/ecj/ecj-4.5M1.jar deleted file mode 100644 index 24c0db1..0000000 Binary files a/ecj/ecj-4.5M1.jar and /dev/null differ diff --git a/ecj/ecj-4.5M7.jar b/ecj/ecj-4.5M7.jar new file mode 100644 index 0000000..c5af94e Binary files /dev/null and b/ecj/ecj-4.5M7.jar differ 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 786ddf4..df40c28 100644 --- a/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java +++ b/jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java @@ -43,7 +43,9 @@ 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.env.ITypeAnnotationWalker; import org.eclipse.jdt.internal.compiler.lookup.ExtraCompilerModifiers; +import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment; import java.util.ArrayList; import java.util.List; @@ -453,4 +455,11 @@ class JAstBinaryType implements IBinaryType { public IBinaryTypeAnnotation[] getTypeAnnotations() { return null; } + + @Override + public ITypeAnnotationWalker enrichWithExternalAnnotationsFor(ITypeAnnotationWalker walker, + Object member, LookupEnvironment environment) { + // Jack does not support ecj external annotation file + return walker; + } } diff --git a/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java b/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java index 60ee5aa..6c2032e 100644 --- a/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java +++ b/jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java @@ -185,4 +185,10 @@ public class JAstClasspath extends ClasspathLocation { @Override public void initialize() { } + + @Override + public boolean hasAnnotationFileFor(String qualifiedTypeName) { + // Jack does not support ecj external annotation file + return false; + } } -- cgit v1.1