From c05909e146c88578268a5454fef577150653b2fa Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 17 Aug 2020 16:58:46 +0100
Subject: [PATCH] Tweak stubs for updatable media

- Add variant for public APIs
- Build against module_current

This is a partial cherry-pick of the CL
I498823de7315f78121975d36d6dc7667a8245085,
which are required by other CLs.

Bug: 147768409
Test: m
Merged-In: I498823de7315f78121975d36d6dc7667a8245085
Change-Id: I811a8a5ff0bda4872ecf7dd62c380fb89a53bf67
---
 media/Android.bp | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/media/Android.bp b/media/Android.bp
index a432c8d2a64d9..220d5719e8a75 100644
--- a/media/Android.bp
+++ b/media/Android.bp
@@ -70,10 +70,10 @@ metalava_updatable_media_args = " --error UnhiddenSystemApi " +
     "--hide MissingPermission --hide BroadcastBehavior " +
     "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
     "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +
-    "--hide HiddenTypedefConstant --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) "
+    "--hide HiddenTypedefConstant "
 
 droidstubs {
-    name: "updatable-media-stubs",
+    name: "updatable-media-stubs-srcs-public",
     srcs: [
         ":updatable-media-srcs",
         ":framework-media-annotation-srcs",
@@ -83,13 +83,34 @@ droidstubs {
         // TODO(b/135922046) remove this
         include_dirs: ["frameworks/base/core/java"],
     },
-    sdk_version: "system_current",
+    sdk_version: "module_current",
+}
+
+droidstubs {
+    name: "updatable-media-stubs-srcs-system",
+    srcs: [
+        ":updatable-media-srcs",
+        ":framework-media-annotation-srcs",
+    ],
+    args: metalava_updatable_media_args +
+        "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) ",
+    aidl: {
+        // TODO(b/135922046) remove this
+        include_dirs: ["frameworks/base/core/java"],
+    },
+    sdk_version: "module_current",
+}
+
+java_library {
+    name: "updatable_media_stubs.public",
+    srcs: [":updatable-media-stubs-srcs-public"],
+    sdk_version: "module_current",
 }
 
 java_library {
     name: "updatable_media_stubs",
-    srcs: [":updatable-media-stubs"],
-    sdk_version: "system_current",
+    srcs: [":updatable-media-stubs-srcs-system"],
+    sdk_version: "module_current",
 }
 
 java_library {