tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "vold: move some libs from shared to static" am: 39f11368a5 am: f4ae30da97 am: f042721b4d

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2598907

Change-Id: Idcfda60f4e545c6b274e12ced27a628a0307f6f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-23 18:16:34 +00:00 committed by Automerger Merge Worker
commit 38f9593a28
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Android.bp
View file

@ -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: [