Merge "libsnapshot: static link libselinux" into main am: 0049369534
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3251031 Change-Id: I9d49c7a7eb22345c2c7ba8188bc41327b2c9dc8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
76a1e0ecdf
1 changed files with 11 additions and 1 deletions
|
|
@ -46,7 +46,6 @@ cc_defaults {
|
|||
"libfstab",
|
||||
"libsnapuserd_client",
|
||||
"libz",
|
||||
"libselinux",
|
||||
],
|
||||
header_libs: [
|
||||
"libfiemap_headers",
|
||||
|
|
@ -112,6 +111,9 @@ cc_library_static {
|
|||
static_libs: [
|
||||
"libfs_mgr_binder",
|
||||
],
|
||||
whole_static_libs: [
|
||||
"libselinux",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
|
|
@ -130,6 +132,9 @@ cc_library {
|
|||
static_libs: [
|
||||
"libsnapshot_cow",
|
||||
],
|
||||
whole_static_libs: [
|
||||
"libselinux",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_static {
|
||||
|
|
@ -144,6 +149,7 @@ cc_library_static {
|
|||
],
|
||||
static_libs: [
|
||||
"libfs_mgr",
|
||||
"libselinux",
|
||||
],
|
||||
}
|
||||
|
||||
|
|
@ -161,6 +167,9 @@ cc_library_static {
|
|||
static_libs: [
|
||||
"libfs_mgr",
|
||||
],
|
||||
whole_static_libs: [
|
||||
"libselinux",
|
||||
],
|
||||
}
|
||||
|
||||
cc_defaults {
|
||||
|
|
@ -243,6 +252,7 @@ cc_library_static {
|
|||
"libfs_mgr",
|
||||
"libgmock",
|
||||
"libgtest",
|
||||
"libselinux",
|
||||
],
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue