Snap for 11200327 from 19dce3a772a8cc99215ef15cfb152eb027471c1a to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I87c633c89484c6537b2aa157d26f7f56735bd647

2 files changed, 13 insertions, 5 deletions

diff --git a/android/include/bits/sockaddr_storage.h b/android/include/bits/sockaddr_storage.h
new file mode 100644
index 00000000..0de9de1c
--- /dev/null
+++ b/android/include/bits/sockaddr_storage.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <features.h>
+
+#define __NEED_sa_family_t
+#include <bits/alltypes.h>
+
+struct sockaddr_storage {
+	sa_family_t ss_family;
+	char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
+	unsigned long __ss_align;
+};
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 0b39d835..acbe63c4 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -371,11 +371,7 @@ struct sockaddr {
 	char sa_data[14];
 };
 
-struct sockaddr_storage {
-	sa_family_t ss_family;
-	char __ss_padding[128-sizeof(long)-sizeof(sa_family_t)];
-	unsigned long __ss_align;
-};
+#include <bits/sockaddr_storage.h>
 
 int socket (int, int, int);
 int socketpair (int, int, int, int [2]);