commit 556ebbf9829c5ebea40a6a53ee22b929dddd890e
author Anton Hansson <hansson@google.com> Tue May 31 11:30:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 31 11:30:46 2022 +0000
tree 2eb5d336e05eb79c904dd6ed24ad8f24b8d5792f
parent 2fc4ae33ff9625b91a7138034e827443c4aaeb9b
parent 61ca2b112fb7bcb9d569dd517b77ba554521f8e2

Merge changes from topic "revert-2110246-revert-2108043-locallog-RHVOQAJCFV-GELQNRAIEE" am: ab498bff17 am: 755b013a70 am: ad25b2a205 am: 61ca2b112f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2110704

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

core/java/Android.bp

diff --git a/core/java/Android.bp b/core/java/Android.bp
index b13413a..f732845 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -177,7 +177,10 @@
     libs: ["unsupportedappusage"],
     sdk_version: "module_current",
     min_sdk_version: "30",
-    apex_available: ["//apex_available:anyapex"],
+    apex_available: [
+        "//apex_available:anyapex",
+        "//apex_available:platform",
+    ],
     visibility: ["//visibility:public"],
 }