1 files changed, 15 insertions, 0 deletions
diff --git a/apex/appsearch/Android.bp b/apex/appsearch/Android.bp
index 827842633942..977e610d734f 100644
--- a/apex/appsearch/Android.bp
+++ b/apex/appsearch/Android.bp
@@ -29,6 +29,7 @@ apex {
     key: "com.android.appsearch.key",
     certificate: ":com.android.appsearch.certificate",
     updatable: false,
+    jni_libs: ["libicing"],
     generate_hashtree: false,
 }
 
@@ -50,6 +51,20 @@ bootclasspath_fragment {
     name: "com.android.appsearch-bootclasspath-fragment",
     contents: ["framework-appsearch"],
     apex_available: ["com.android.appsearch"],
+
+    // The bootclasspath_fragments that provide APIs on which this depends.
+    fragments: [
+        {
+            apex: "com.android.art",
+            module: "art-bootclasspath-fragment",
+        },
+    ],
+
+    // Additional stubs libraries that this fragment's contents use which are
+    // not provided by another bootclasspath_fragment.
+    additional_stubs: [
+        "android-non-updatable",
+    ],
 }
 
 // Encapsulate the contributions made by the com.android.appsearch to the systemserverclasspath.