commit 9d2bccb7b4221ef99325d47bc7b80866ce74bfc4
author Colin Cross <ccross@android.com> Wed Mar 16 00:24:31 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 16 00:24:31 2022 +0000
tree ac622b504d672fbb8a71f7b35cff965ed5ceffe8
parent e90d78995e537917f3eaca5479a2efff2893d6b0
parent 4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e

Tweak linux_glibc properties for musl builds in external/python/cpython2 am: fc6603babf am: 5796352143 am: 80d3df0782 am: 4d5a7eb9b4

Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538

Change-Id: I504c774b2658f204cb371f760e479e8c3a522a9d

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",