Merge "vold: move some libs from shared to static" am: 39f11368a5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2598907 Change-Id: I237a3145216534a9c2e601e5c5606bbc87ea68eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
f4ae30da97
1 changed files with 9 additions and 17 deletions
26
Android.bp
26
Android.bp
|
@ -29,6 +29,9 @@ cc_defaults {
|
|||
name: "vold_default_libs",
|
||||
|
||||
static_libs: [
|
||||
"android.hardware.health.storage@1.0",
|
||||
"android.hardware.health.storage-V1-ndk",
|
||||
"android.security.maintenance-ndk",
|
||||
"libasync_safe",
|
||||
"libavb",
|
||||
"libbootloader_message",
|
||||
|
@ -47,10 +50,10 @@ cc_defaults {
|
|||
"libboot_control_client",
|
||||
"libbase",
|
||||
"libbinder",
|
||||
"libbinder_ndk",
|
||||
"libcrypto",
|
||||
"libcrypto_utils",
|
||||
"libcutils",
|
||||
"libdiskconfig",
|
||||
"libext4_utils",
|
||||
"libf2fs_sparseblock",
|
||||
"libgsi",
|
||||
|
@ -58,6 +61,7 @@ cc_defaults {
|
|||
"libhardware_legacy",
|
||||
"libincfs",
|
||||
"libhidlbase",
|
||||
"libkeymint_support",
|
||||
"libkeyutils",
|
||||
"liblog",
|
||||
"liblogwrap",
|
||||
|
@ -160,13 +164,6 @@ cc_library_static {
|
|||
cppflags: ["-D__ANDROID_DEBUGGABLE__"],
|
||||
},
|
||||
},
|
||||
shared_libs: [
|
||||
"android.hardware.health.storage@1.0",
|
||||
"android.hardware.health.storage-V1-ndk",
|
||||
"android.security.maintenance-ndk",
|
||||
"libbinder_ndk",
|
||||
"libkeymint_support",
|
||||
],
|
||||
whole_static_libs: [
|
||||
"libcom.android.sysprop.apex",
|
||||
"libc++fs",
|
||||
|
@ -182,7 +179,10 @@ cc_binary {
|
|||
],
|
||||
|
||||
srcs: ["main.cpp"],
|
||||
static_libs: ["libvold"],
|
||||
static_libs: [
|
||||
"libvold",
|
||||
],
|
||||
|
||||
init_rc: [
|
||||
"vold.rc",
|
||||
],
|
||||
|
@ -193,14 +193,6 @@ cc_binary {
|
|||
"fuseMedia.o",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
"android.hardware.health.storage@1.0",
|
||||
"android.hardware.health.storage-V1-ndk",
|
||||
"android.security.maintenance-ndk",
|
||||
"libbinder_ndk",
|
||||
"libkeymint_support",
|
||||
],
|
||||
|
||||
product_variables: {
|
||||
arc: {
|
||||
exclude_srcs: [
|
||||
|
|
Loading…
Reference in a new issue