diff options
author | mikaelpeltier <mikaelpeltier@google.com> | 2015-05-12 09:15:05 +0200 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-11 22:10:55 +0100 |
commit | 024c695f64424de40960430a2869cb88c5ec5994 (patch) | |
tree | 8907ec2c4667c96a6cfcaa4c7bd8f90e05019fe3 /jack | |
parent | da4fc183b552020e0a04e47f7b8967b0e6c459d0 (diff) | |
download | toolchain_jack-024c695f64424de40960430a2869cb88c5ec5994.tar.gz toolchain_jack-024c695f64424de40960430a2869cb88c5ec5994.tar.bz2 toolchain_jack-024c695f64424de40960430a2869cb88c5ec5994.zip |
Update Ecj to 4.5M7
Change-Id: If63eaaf5dda587d3cd1d19a7adcaf3c3ee5d2501
Diffstat (limited to 'jack')
-rw-r--r-- | jack/src/com/android/jack/ecj/loader/jast/JAstBinaryType.java | 9 | ||||
-rw-r--r-- | jack/src/com/android/jack/ecj/loader/jast/JAstClasspath.java | 6 |
2 files changed, 15 insertions, 0 deletions
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 786ddf4f..df40c28e 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 60ee5aab..6c2032eb 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; + } } |