diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-02-02 13:59:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-02 13:59:47 +0000 |
| commit | b1511a8f20a10f9be55fef9a8c20b07be2ce9c2f (patch) | |
| tree | cb6537ace4f3f2ad9d08adcfa8234f88d861502f /jack-tests/tests/com | |
| parent | 720b527ef8245aafef459635ff48d99216a606c0 (diff) | |
| parent | fc810afc5e407ed19428827d08995b82a0965ef0 (diff) | |
| download | toolchain_jack-b1511a8f20a10f9be55fef9a8c20b07be2ce9c2f.zip toolchain_jack-b1511a8f20a10f9be55fef9a8c20b07be2ce9c2f.tar.gz toolchain_jack-b1511a8f20a10f9be55fef9a8c20b07be2ce9c2f.tar.bz2 | |
Merge "Use a Runtime annotation for shrob test2" into ub-jack
Diffstat (limited to 'jack-tests/tests/com')
| -rw-r--r-- | jack-tests/tests/com/android/jack/shrob/test002/jack/A.java | 2 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/shrob/test002/proguard.flags005 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/test002/jack/A.java b/jack-tests/tests/com/android/jack/shrob/test002/jack/A.java index 76b4fdd..7fd9ef8 100644 --- a/jack-tests/tests/com/android/jack/shrob/test002/jack/A.java +++ b/jack-tests/tests/com/android/jack/shrob/test002/jack/A.java @@ -17,7 +17,7 @@ package com.android.jack.shrob.test002.jack; public class A { - @Override + @Deprecated public String toString() { return null; } diff --git a/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags005 b/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags005 index 7b4eb3e..a0d9b41 100644 --- a/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags005 +++ b/jack-tests/tests/com/android/jack/shrob/test002/proguard.flags005 @@ -1,3 +1,3 @@ -keepclasseswithmembers class * { - @!*.NotOverride java.lang.String toString(); + @!*.NotDeprecated java.lang.String toString(); }
\ No newline at end of file |