3 files changed, 4 insertions, 5 deletions
diff --git a/java/Android.bp b/java/Android.bp
index e31f878..326dc51 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -70,7 +70,6 @@ java_library {
     host_supported: true,
     optimize: {
         proguard_flags_files: ["aconfig_proguard.flags"],
-        export_proguard_flags_files: true,
     },
     visibility: [
         "//visibility:public",
diff --git a/java/android/annotation/NonNull.java b/java/android/annotation/NonNull.java
index 635959b..20472ba 100644
--- a/java/android/annotation/NonNull.java
+++ b/java/android/annotation/NonNull.java
@@ -18,7 +18,7 @@ package android.annotation;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.CLASS;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -32,7 +32,7 @@ import java.lang.annotation.Target;
  * @returnDoc This value cannot be {@code null}.
  * @hide
  */
-@Retention(CLASS)
+@Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})
 public @interface NonNull {
 }
diff --git a/java/android/annotation/Nullable.java b/java/android/annotation/Nullable.java
index 11b6511..b8473e7 100644
--- a/java/android/annotation/Nullable.java
+++ b/java/android/annotation/Nullable.java
@@ -18,7 +18,7 @@ package android.annotation;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.CLASS;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -39,7 +39,7 @@ import java.lang.annotation.Target;
  * @returnDoc This value may be {@code null}.
  * @hide
  */
-@Retention(CLASS)
+@Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})
 public @interface Nullable {
 }