[strace/strace] Bundled linux/socket.h breaks compiling for Android (#174)

[Chih-Hsuan Yen]

Sure, here is the content of `/opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/linux/socket.h`

```C
/****************************************************************************
 ****************************************************************************
 ***
 ***   This header was automatically generated from a Linux kernel header
 ***   of the same name, to make information necessary for userspace to
 ***   call into the kernel available to libc.  It contains only constants,
 ***   structures, and macros generated from the original header, and thus,
 ***   contains no copyrightable information.
 ***
 ***   To edit the content of this header, modify the corresponding
 ***   source file (e.g. under external/kernel-headers/original/) then
 ***   run bionic/libc/kernel/tools/update_all.py
 ***
 ***   Any manual change here will be lost the next time this script will
 ***   be run. You've been warned!
 ***
 ****************************************************************************
 ****************************************************************************/
#ifndef _UAPI_LINUX_SOCKET_H
#define _UAPI_LINUX_SOCKET_H
#define _K_SS_MAXSIZE 128
typedef unsigned short __kernel_sa_family_t;
struct sockaddr_storage {
  union {
    struct {
      __kernel_sa_family_t ss_family;
      char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
    };
    void * __align;
  };
};
#endif
```

I guess files mentioned in comments are:

* https://android.googlesource.com/platform/external/kernel-headers/+/master/original/uapi/linux/socket.h
* https://android.googlesource.com/platform/bionic/+/master/libc/kernel/tools/update_all.py

Looking into scripts of bionic, I found a file that seems to replace `__kernel_sockaddr_storage` with `sockaddr_storage`: https://android.googlesource.com/platform/bionic/+/master/libc/kernel/tools/defaults.py#93

```Python
    # In this case the kernel tries to keep out of our way, but we're happy to use its definition.
    "__kernel_sockaddr_storage": "sockaddr_storage",
```

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/strace/strace/issues/174#issuecomment-781299630
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20210218/d40fc61b/attachment.htm>