Snap for 8358640 from 4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e to mainline-go-cellbroadcast-release

Change-Id: I531aa60df7f7797f5b74f82fbb937c67b0fa9872

Android.bp

diff --git a/Android.bp b/Android.bp
index 0289573..b13d7e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -114,10 +114,17 @@
         linux_glibc_x86: {
             enabled: false,
         },
+        linux_musl_x86: {
+            enabled: false,
+        },
         linux_glibc_x86_64: {
             local_include_dirs: ["linux_x86_64/pyconfig"],
             cflags: ["-Werror"],
         },
+        linux_musl_x86_64: {
+            local_include_dirs: ["linux_x86_64/pyconfig"],
+            cflags: ["-Werror"],
+        },
         windows: {
             enabled: false,
         },
@@ -976,13 +983,7 @@
                 "Modules/_ctypes/libffi/src/x86/darwin64.S",
             ],
         },
-        linux_bionic: {
-            local_include_dirs: ["linux_x86_64/libffi"],
-            srcs: [
-                "Modules/_ctypes/libffi/src/x86/unix64.S",
-            ],
-        },
-        linux_glibc_x86_64: {
+        host_linux: {
             local_include_dirs: ["linux_x86_64/libffi"],
             srcs: [
                 "Modules/_ctypes/libffi/src/x86/unix64.S",

linux_x86_64/pyconfig/pyconfig.h

diff --git a/linux_x86_64/pyconfig/pyconfig.h b/linux_x86_64/pyconfig/pyconfig.h
index 210484d..e6c363d 100644
--- a/linux_x86_64/pyconfig/pyconfig.h
+++ b/linux_x86_64/pyconfig/pyconfig.h
@@ -858,7 +858,10 @@
 #define HAVE_TMPNAM 1
 
 /* Define to 1 if you have the `tmpnam_r' function. */
+#ifdef __GLIBC__
+// musl does not have tmpnam_r
 #define HAVE_TMPNAM_R 1
+#endif
 
 /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
    `HAVE_STRUCT_TM_TM_ZONE' instead. */