Add systemserverclasspath_fragment.
Note that the contents of the fragment are added as dependencies to an
apex, so there is no need to duplicate them in java_libs.
Bug: 180105615
Test: atest CtsClasspathsTestCases
Change-Id: Ie4732ee602983047859b29b939585a3f716d5bdc
diff --git a/apex/Android.bp b/apex/Android.bp
index d911ad3..dc22628 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -25,9 +25,7 @@
name: "com.android.media-defaults",
updatable: true,
bootclasspath_fragments: ["com.android.media-bootclasspath-fragment"],
- java_libs: [
- "service-media-s",
- ],
+ systemserverclasspath_fragments: ["com.android.media-systemserverclasspath-fragment"],
multilib: {
first: {
// Extractor process runs only with the primary ABI.
@@ -101,6 +99,13 @@
apex_available: ["com.android.media"],
}
+// Encapsulate the contributions made by the com.android.media to the systemserverclasspath.
+systemserverclasspath_fragment {
+ name: "com.android.media-systemserverclasspath-fragment",
+ contents: ["service-media-s"],
+ apex_available: ["com.android.media"],
+}
+
filegroup {
name: "com.android.media-androidManifest",
srcs: ["AndroidManifest-media.xml"],