From b720291b966b53b8563ad26cbcbf096979f38c74 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Tue, 18 May 2021 14:43:38 +0100
Subject: [PATCH] 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
---
 apex/appsearch/Android.bp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/apex/appsearch/Android.bp b/apex/appsearch/Android.bp
index c592d1305cd17..9a420160d3fd9 100644
--- a/apex/appsearch/Android.bp
+++ b/apex/appsearch/Android.bp
@@ -25,9 +25,7 @@ apex {
     name: "com.android.appsearch",
     manifest: "apex_manifest.json",
     bootclasspath_fragments: ["com.android.appsearch-bootclasspath-fragment"],
-    java_libs: [
-        "service-appsearch",
-    ],
+    systemserverclasspath_fragments: ["com.android.appsearch-systemserverclasspath-fragment"],
     key: "com.android.appsearch.key",
     certificate: ":com.android.appsearch.certificate",
     updatable: false,
@@ -52,3 +50,10 @@ bootclasspath_fragment {
     contents: ["framework-appsearch"],
     apex_available: ["com.android.appsearch"],
 }
+
+// Encapsulate the contributions made by the com.android.appsearch to the systemserverclasspath.
+systemserverclasspath_fragment {
+    name: "com.android.appsearch-systemserverclasspath-fragment",
+    contents: ["service-appsearch"],
+    apex_available: ["com.android.appsearch"],
+}