diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2015-04-03 11:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-03 11:39:54 +0000 |
| commit | d6a834dcb76b22de4e21353131cebb87ed108d88 (patch) | |
| tree | 3401fe2057f28398b2c0a58097071682b99f00ca | |
| parent | c067db174f366306a71b0b1e68e8bd3c7e8214f2 (diff) | |
| parent | 4575c7da5541b0d2d2098e7e7ddd895be4d2456f (diff) | |
| download | toolchain_jill-d6a834dcb76b22de4e21353131cebb87ed108d88.zip toolchain_jill-d6a834dcb76b22de4e21353131cebb87ed108d88.tar.gz toolchain_jill-d6a834dcb76b22de4e21353131cebb87ed108d88.tar.bz2 | |
Merge "Rename ANNOTATION_LITERAL to ANNOTATION" into ub-jack
| -rw-r--r-- | jill/src/com/android/jill/backend/jayce/Token.java | 2 | ||||
| -rw-r--r-- | jill/src/com/android/jill/frontend/java/AnnotationWriter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jill/src/com/android/jill/backend/jayce/Token.java b/jill/src/com/android/jill/backend/jayce/Token.java index e7c8f2f..d1113a5 100644 --- a/jill/src/com/android/jill/backend/jayce/Token.java +++ b/jill/src/com/android/jill/backend/jayce/Token.java @@ -45,7 +45,7 @@ public enum Token { ADD_OPERATION("+"), ALLOC("alloc"), AND_OPERATION("&&"), - ANNOTATION_LITERAL("annotation-literal"), + ANNOTATION("annotation-literal"), ANNOTATION_METHOD("annotation-method"), ANNOTATION_TYPE("annotation"), ARRAY_LENGTH("array-length"), diff --git a/jill/src/com/android/jill/frontend/java/AnnotationWriter.java b/jill/src/com/android/jill/frontend/java/AnnotationWriter.java index 97b97ea..4bb366e 100644 --- a/jill/src/com/android/jill/frontend/java/AnnotationWriter.java +++ b/jill/src/com/android/jill/frontend/java/AnnotationWriter.java @@ -181,7 +181,7 @@ public class AnnotationWriter extends JillWriter { private void writeAnnotation(@Nonnull AnnotationNode anno, @Nonnull RetentionPolicy retentionPolicy) throws IOException { sourceInfoWriter.writeUnknwonDebugBegin(); - writer.writeKeyword(Token.ANNOTATION_LITERAL); + writer.writeKeyword(Token.ANNOTATION); writer.writeOpen(); writer.writeRetentionPolicyEnum(retentionPolicy); writer.writeId(anno.desc); |