commit 24da2e6b35f9eb1032cd245e36db14390690b8fb
author Alexander Dorokhine <adorokhine@google.com> Mon Jun 28 19:44:58 2021 -0700
committer Alexander Dorokhine <adorokhine@google.com> Mon Jun 28 19:44:58 2021 -0700
tree 86c1c25522e9326bffb5392d2b2e2172e3e81832
parent 881da35724d664381e672bfb0d737048751ef785

Move libicing.so out of /usr/lib, into the appsearch apex.

Bug: 169826971
Test: Presubmit
Change-Id: Ibe5dd5014c5a70cb5b0fcf3eb33db9911047bdc8

apex/appsearch/Android.bp

diff --git a/apex/appsearch/Android.bp b/apex/appsearch/Android.bp
index 8278426..e6237fa 100644
--- a/apex/appsearch/Android.bp
+++ b/apex/appsearch/Android.bp
@@ -29,6 +29,7 @@
     key: "com.android.appsearch.key",
     certificate: ":com.android.appsearch.certificate",
     updatable: false,
+    jni_libs: ["libicing"],
     generate_hashtree: false,
 }
 

apex/appsearch/service/Android.bp

diff --git a/apex/appsearch/service/Android.bp b/apex/appsearch/service/Android.bp
index e5675f6..5ab7ff9 100644
--- a/apex/appsearch/service/Android.bp
+++ b/apex/appsearch/service/Android.bp
@@ -53,9 +53,6 @@
         "framework-appsearch.impl",
         "unsupportedappusage", // TODO(b/181887768) should be removed
     ],
-    required: [
-        "libicing",
-    ],
     defaults: ["framework-system-server-module-defaults"],
     permitted_packages: [
         "com.android.server.appsearch",