Skip to content

Commit ff20d04

Browse files
committed
Fix multiple symbol definitions on Android CI
1 parent 9c7a326 commit ff20d04

File tree

1 file changed

+33
-0
lines changed

1 file changed

+33
-0
lines changed

libc-test/build.rs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,6 +1638,9 @@ fn test_android(target: &str) {
16381638
// FIXME: `sighandler_t` type is incorrect, see:
16391639
// https://github.com/rust-lang/libc/issues/1359
16401640
"sighandler_t" => true,
1641+
1642+
// These are tested in the `linux_elf.rs` file.
1643+
"Elf64_Phdr" | "Elf32_Phdr" => true,
16411644
_ => false,
16421645
}
16431646
});
@@ -1655,12 +1658,42 @@ fn test_android(target: &str) {
16551658
// 'private' type
16561659
"prop_info" => true,
16571660

1661+
// These are tested in the `linux_elf.rs` file.
1662+
"Elf64_Phdr" | "Elf32_Phdr" => true,
1663+
16581664
_ => false,
16591665
}
16601666
});
16611667

16621668
cfg.skip_const(move |name| {
16631669
match name {
1670+
// The IPV6 constants are tested in the `linux_ipv6.rs` tests:
1671+
| "IPV6_FLOWINFO"
1672+
| "IPV6_FLOWLABEL_MGR"
1673+
| "IPV6_FLOWINFO_SEND"
1674+
| "IPV6_FLOWINFO_FLOWLABEL"
1675+
| "IPV6_FLOWINFO_PRIORITY"
1676+
// The F_ fnctl constants are tested in the `linux_fnctl.rs` tests:
1677+
| "F_CANCELLK"
1678+
| "F_ADD_SEALS"
1679+
| "F_GET_SEALS"
1680+
| "F_SEAL_SEAL"
1681+
| "F_SEAL_SHRINK"
1682+
| "F_SEAL_GROW"
1683+
| "F_SEAL_WRITE" => true,
1684+
1685+
// FIXME: conflicts with glibc headers and is tested in
1686+
// `linux_termios.rs` below:
1687+
| "BOTHER"
1688+
| "IBSHIFT"
1689+
| "TCGETS2"
1690+
| "TCSETS2"
1691+
| "TCSETSW2"
1692+
| "TCSETSF2" => true,
1693+
1694+
// The `ARPHRD_CAN` is tested in the `linux_if_arp.rs` tests:
1695+
"ARPHRD_CAN" => true,
1696+
16641697
// FIXME: deprecated: not available in any header
16651698
// See: https://github.com/rust-lang/libc/issues/1356
16661699
"ENOATTR" => true,

0 commit comments

Comments
 (0)