forked from BoardwalkApp/boardwalk2-openjdk-build
-
Notifications
You must be signed in to change notification settings - Fork 181
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Workaround: skip check for ipv6 support (by @nexplorer-3e)
The commit is made instead of PR merge because the PR has a weird file in it
- Loading branch information
1 parent
471ca51
commit 691cab3
Showing
3 changed files
with
62 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// skip some checks as AOSP does | ||
diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c | ||
index 4ec11a136..01b85db4d 100644 | ||
--- a/src/java.base/unix/native/libnet/net_util_md.c | ||
+++ b/src/java.base/unix/native/libnet/net_util_md.c | ||
@@ -129,6 +129,7 @@ jint IPv6_supported() | ||
SOCKETADDRESS sa; | ||
socklen_t sa_len = sizeof(SOCKETADDRESS); | ||
|
||
+#ifndef __ANDROID__ // ANDROID: skip check, see libcore commit ae218d9b | ||
fd = socket(AF_INET6, SOCK_STREAM, 0) ; | ||
if (fd < 0) { | ||
/* | ||
@@ -172,6 +173,7 @@ jint IPv6_supported() | ||
} | ||
} | ||
#endif | ||
+#endif // !defined __ANDROID__ | ||
|
||
/* | ||
* OK we may have the stack available in the kernel, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// skip some checks as AOSP does | ||
diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c | ||
index 4ec11a136..01b85db4d 100644 | ||
--- a/src/java.base/unix/native/libnet/net_util_md.c | ||
+++ b/src/java.base/unix/native/libnet/net_util_md.c | ||
@@ -129,6 +129,7 @@ jint IPv6_supported() | ||
SOCKETADDRESS sa; | ||
socklen_t sa_len = sizeof(SOCKETADDRESS); | ||
|
||
+#ifndef __ANDROID__ // ANDROID: skip check, see libcore commit ae218d9b | ||
fd = socket(AF_INET6, SOCK_STREAM, 0) ; | ||
if (fd < 0) { | ||
/* | ||
@@ -172,6 +173,7 @@ jint IPv6_supported() | ||
} | ||
} | ||
#endif | ||
+#endif // !defined __ANDROID__ | ||
|
||
/* | ||
* OK we may have the stack available in the kernel, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters