| commit | e0a7d51c6ff7966051530b658f50544e4dcd1d79 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Apr 14 20:10:10 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 14 20:10:10 2023 +0000 |
| tree | a07fdfe4d8063216811f37743666879437bbddc9 | |
| parent | 8ce2187b3365d2a2c6138c305cb955cd175ae732 [diff] | |
| parent | 6ff7f99b610604e6ef14b67c08adbce2ad8a765b [diff] |
Merge "Skip utmp_test.cpp for musl" am: 6ff7f99b61 Original change: https://android-review.googlesource.com/c/platform/bionic/+/2538132 Change-Id: I29bfa098dfe6759d330d65f1f3994efe4fa48728 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/Android.bp b/tests/Android.bp index 1949079..da1df12 100644 --- a/tests/Android.bp +++ b/tests/Android.bp
@@ -541,6 +541,10 @@ // unsupported relocation type 37 "ifunc_test.cpp", + + // musl #defines utmp to utmpx, causing a collision with + // utmpx_test.cpp + "utmp_test.cpp", ], }, },