Merge "Move libicing.so out of /usr/lib, into the appsearch apex." into sc-dev am: 5a26c6b39c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003778 Change-Id: I5261e4fe5e3274101daaab726cbe07bf46bce109
This commit is contained in:
committed by
Automerger Merge Worker
commit
e721d544c0
@@ -29,6 +29,7 @@ apex {
|
|||||||
key: "com.android.appsearch.key",
|
key: "com.android.appsearch.key",
|
||||||
certificate: ":com.android.appsearch.certificate",
|
certificate: ":com.android.appsearch.certificate",
|
||||||
updatable: false,
|
updatable: false,
|
||||||
|
jni_libs: ["libicing"],
|
||||||
generate_hashtree: false,
|
generate_hashtree: false,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,9 +53,6 @@ java_library {
|
|||||||
"framework-appsearch.impl",
|
"framework-appsearch.impl",
|
||||||
"unsupportedappusage", // TODO(b/181887768) should be removed
|
"unsupportedappusage", // TODO(b/181887768) should be removed
|
||||||
],
|
],
|
||||||
required: [
|
|
||||||
"libicing",
|
|
||||||
],
|
|
||||||
defaults: ["framework-system-server-module-defaults"],
|
defaults: ["framework-system-server-module-defaults"],
|
||||||
permitted_packages: [
|
permitted_packages: [
|
||||||
"com.android.server.appsearch",
|
"com.android.server.appsearch",
|
||||||
|
|||||||
Reference in New Issue
Block a user