JRE reflection stripping: do not strip metadata from runtime annotati…

…ons. Change on 2018/09/17 by antoniocortes <antoniocortes@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=213266548
michaelyousrie · Oct 9, 2018 · fd9b2d6 · fd9b2d6
1 parent f26f53b
commit fd9b2d6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/jre_emul/android/platform/libcore/ojluni/src/main/java/java/lang/Deprecated.java b/jre_emul/android/platform/libcore/ojluni/src/main/java/java/lang/Deprecated.java
@@ -25,7 +25,6 @@
 
 package java.lang;
 
-import com.google.j2objc.annotations.ReflectionSupport;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 
@@ -41,7 +40,5 @@
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(value={CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})
-// TODO(user): remove once reflection data is not stripped from runtime annotations.
-@ReflectionSupport(value = ReflectionSupport.Level.FULL)
 public @interface Deprecated {
 }
diff --git a/translator/src/main/java/com/google/devtools/j2objc/util/TranslationUtil.java b/translator/src/main/java/com/google/devtools/j2objc/util/TranslationUtil.java
@@ -120,7 +120,7 @@ public boolean needsReflection(TypeElement type) {
     if (ElementUtil.isLambda(type)) {
       return false;
     }
-    if (isJUnitTestClass(type)) {
+    if (isJUnitTestClass(type) || ElementUtil.isRuntimeAnnotation(type)) {
       return true;
     }
     PackageElement packageElement = ElementUtil.getPackage(type);

diff --git a/translator/src/test/java/com/google/devtools/j2objc/util/TranslationUtilTest.java b/translator/src/test/java/com/google/devtools/j2objc/util/TranslationUtilTest.java
@@ -102,4 +102,21 @@ public void testJUnit4TestKeepsReflection() {
     TranslationUtil translationUtil = unit.getEnv().translationUtil();
     assertTrue(translationUtil.needsReflection(unit.getTypes().get(0)));
   }
+
+  public void testRuntimeAnnotationKeepsReflection() {
+    options.setStripReflection(true);
+    String source =
+        "package foo; "
+            + "import static java.lang.annotation.ElementType.TYPE; "
+            + "import static java.lang.annotation.RetentionPolicy.RUNTIME; "
+            + "import java.lang.annotation.Retention; "
+            + "import java.lang.annotation.Target; "
+            + "import org.junit.runners.JUnit4; "
+            + "@Retention(RUNTIME) "
+            + "@Target(value={TYPE}) "
+            + "public @interface AnAnnotation {} ";
+    CompilationUnit unit = translateType("foo.AnAnnotation", source);
+    TranslationUtil translationUtil = unit.getEnv().translationUtil();
+    assertTrue(translationUtil.needsReflection(unit.getTypes().get(0)));
+  }
 }