commit 97b284f7cb1768402686fe220b3dab9e5c3d74bd
author William Escande <wescande@google.com> Fri Nov 24 05:27:02 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 24 05:27:02 2023 +0000
tree 823991a1174184db4b2d4a5c192b79ee67270341
parent cbf80854fe121bd4c9d90b699dfe479d2aced3cb
parent 3b3531fdc000b10c7648a900bf322eade6f40e1c

Merge "Pass expresslog class as parameter" into main am: 3b3531fdc0

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2841755

Change-Id: I73bb53f7b9e83fa542646bf94d20eab4263b6d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

java/Android.bp

diff --git a/java/Android.bp b/java/Android.bp
index a1ab7a3..dbe6e92 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -70,7 +70,6 @@
     host_supported: true,
     optimize: {
         proguard_flags_files: ["aconfig_proguard.flags"],
-        export_proguard_flags_files: true,
     },
     visibility: [
         "//visibility:public",

java/android/annotation/NonNull.java

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 @@
 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 @@
  * @returnDoc This value cannot be {@code null}.
  * @hide
  */
-@Retention(CLASS)
+@Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})
 public @interface NonNull {
 }

java/android/annotation/Nullable.java

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 @@
 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 @@
  * @returnDoc This value may be {@code null}.
  * @hide
  */
-@Retention(CLASS)
+@Retention(SOURCE)
 @Target({METHOD, PARAMETER, FIELD})
 public @interface Nullable {
 }