Merge "Skip utmp_test.cpp for musl" am: 6ff7f99b61 am: e0a7d51c6f am: 127a1d7ac5

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2538132

Change-Id: I6565384c9d484b742e68def18f7e4176307f363b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross 2023-04-14 21:09:38 +00:00 committed by Automerger Merge Worker
commit 19df9c4951

View file

@ -541,6 +541,10 @@ cc_test_library {
// unsupported relocation type 37 // unsupported relocation type 37
"ifunc_test.cpp", "ifunc_test.cpp",
// musl #defines utmp to utmpx, causing a collision with
// utmpx_test.cpp
"utmp_test.cpp",
], ],
}, },
}, },