Snap for 8414339 from 4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e to tm-qpr1-release
Change-Id: I45843e68df743c6b68c45cf35fdf3de2e7a9df01
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",