From 24da2e6b35f9eb1032cd245e36db14390690b8fb Mon Sep 17 00:00:00 2001 From: Alexander Dorokhine Date: Mon, 28 Jun 2021 19:44:58 -0700 Subject: [PATCH] Move libicing.so out of /usr/lib, into the appsearch apex. Bug: 169826971 Test: Presubmit Change-Id: Ibe5dd5014c5a70cb5b0fcf3eb33db9911047bdc8 --- apex/appsearch/Android.bp | 1 + apex/appsearch/service/Android.bp | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apex/appsearch/Android.bp b/apex/appsearch/Android.bp index 827842633942e..e6237fa1ee607 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, } diff --git a/apex/appsearch/service/Android.bp b/apex/appsearch/service/Android.bp index e5675f688fd73..5ab7ff9f13c07 100644 --- a/apex/appsearch/service/Android.bp +++ b/apex/appsearch/service/Android.bp @@ -53,9 +53,6 @@ java_library { "framework-appsearch.impl", "unsupportedappusage", // TODO(b/181887768) should be removed ], - required: [ - "libicing", - ], defaults: ["framework-system-server-module-defaults"], permitted_packages: [ "com.android.server.appsearch",