From 1ca6fa3b38b7bd4109f0e5017f633be113fee0a6 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 11 Jun 2021 13:05:21 +0100
Subject: [PATCH] Add framework-media to sdk

This was removed in Iff38291b964de4116bcdefe4fd74136c4878c543 in favor
of using the bootclasspath fragment. However the bootclasspath fragment
for media does not contain the API tracking files, so it back for now
to make sure we can finalize the media API files.

This CL may be revertable in the future if we can get the
java_sdk_library into the bootclasspath_fragment somehow.

Bug: 190807367
Bug: 188427719
Test: m media-module-sdk and inspect the zip for api tracking files
Change-Id: Ia01c32d4c6c6bad734df053da0024a139a808a54
---
 apex/media/Android.bp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apex/media/Android.bp b/apex/media/Android.bp
index 2b4b3f0f52e8b..f2e64ce0b2c57 100644
--- a/apex/media/Android.bp
+++ b/apex/media/Android.bp
@@ -28,5 +28,8 @@ package {
 sdk {
     name: "media-module-sdk",
     bootclasspath_fragments: ["com.android.media-bootclasspath-fragment"],
-    java_sdk_libs: ["service-media-s"],
+    java_sdk_libs: [
+        "framework-media",
+        "service-media-s",
+    ],
 }