Merge "Revert "Tweak linux_glibc properties for musl builds in external/python/cpython3"" am: 063970b3cb am: 012b62c548 am: a6fc77d897 am: 26f786d2db

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

Change-Id: Ia573235c04e69a1cd7f56c7512f9b2ddf520cff6

2 files changed, 14 insertions, 42 deletions

diff --git a/Android.bp b/Android.bp
index 209f4e7fc8..13e70961a2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -71,7 +71,7 @@ soong_config_module_type {
     properties: ["defaults"],
 }
 
-// By default, disable the source and use the prebuilts for host linux
+// By default, disable the source and use the prebuilts for host linux_glibc
 // and darwin. Overridden by cpython3-interp-force_build_host when
 // force_build_host is true (set on aosp-build-tools).
 cc_defaults {
@@ -81,9 +81,6 @@ cc_defaults {
         linux_glibc: {
             enabled: false,
         },
-        linux_musl: {
-            enabled: false,
-        },
         darwin: {
             enabled: false,
         },
@@ -97,9 +94,6 @@ cc_defaults {
         linux_glibc: {
             enabled: true,
         },
-        linux_musl: {
-            enabled: true,
-        },
         darwin: {
             enabled: true,
         },
@@ -173,17 +167,10 @@ cpython3_cc_defaults {
         linux_glibc_x86: {
             enabled: false,
         },
-        linux_musl_x86: {
-            enabled: false,
-        },
         linux_glibc_x86_64: {
             local_include_dirs: ["android/linux_x86_64/pyconfig"],
             cflags: ["-DSOABI=\"cpython-39android-x86_64-linux-gnu\""],
         },
-        linux_musl_x86_64: {
-            local_include_dirs: ["android/linux_x86_64/pyconfig"],
-            cflags: ["-DSOABI=\"cpython-39android-x86_64-linux-gnu\""],
-        },
         windows: {
             enabled: false,
         },
@@ -371,6 +358,10 @@ cc_defaults {
     target: {
         linux_glibc_x86_64: {
             host_ldlibs: ["-lutil"],
+            static_libs: [
+                "libopenssl_ssl",
+                "libopenssl_crypto",
+            ],
         },
         linux: {
             // Due to test infra limitations, Python native symbols are linked
@@ -384,20 +375,15 @@ cc_defaults {
                 "-framework SystemConfiguration",
                 "-framework CoreFoundation",
             ],
-        },
-        host: {
             static_libs: [
-                "libsqlite",
-                "liblog",
                 "libopenssl_ssl",
                 "libopenssl_crypto",
             ],
         },
-        linux_bionic: {
-            // Linux Bionic doesn't have openssl prebuilts
-            exclude_static_libs: [
-                "libopenssl_ssl",
-                "libopenssl_crypto",
+        host: {
+            static_libs: [
+                "libsqlite",
+                "liblog",
             ],
         },
         android: {
@@ -439,9 +425,6 @@ cc_library_static {
         linux_glibc_x86_64: {
             srcs: ["android/linux_x86_64/config.c"],
         },
-        linux_musl_x86_64: {
-            srcs: ["android/linux_x86_64/config.c"],
-        },
         darwin: {
             srcs: ["android/darwin_x86_64/config.c"],
         },
@@ -527,13 +510,6 @@ cc_library_static {
                 "libopenssl_crypto",
             ],
         },
-        linux_musl_x86_64: {
-            srcs: [":py3-c-modules-linux_x86_64"],
-            static_libs: [
-                "libopenssl_ssl",
-                "libopenssl_crypto",
-            ],
-        },
         darwin: {
             srcs: [":py3-c-modules-darwin_x86_64"],
             static_libs: [
diff --git a/Lib/Android.bp b/Lib/Android.bp
index 3b9c289d74..8656f5c134 100644
--- a/Lib/Android.bp
+++ b/Lib/Android.bp
@@ -76,11 +76,7 @@ python_defaults {
     name: "py3-stdlib-force-build",
     defaults_visibility: ["//visibility:private"],
     target: {
-        glibc: {
-            exclude_srcs: [":py3-stdlib-prebuilt-srcs"],
-            srcs: [":py3-stdlib-srcs"],
-        },
-        musl: {
+        linux_glibc: {
             exclude_srcs: [":py3-stdlib-prebuilt-srcs"],
             srcs: [":py3-stdlib-srcs"],
         },
@@ -97,13 +93,13 @@ cpython3_python_stdlib {
     pkg_path: "stdlib",
     host_supported: true,
     target: {
-        bionic: {
+        android: {
             srcs: [":py3-stdlib-srcs"],
         },
-        glibc: {
-            srcs: [":py3-stdlib-prebuilt-srcs"],
+        linux_bionic: {
+            srcs: [":py3-stdlib-srcs"],
         },
-        musl: {
+        linux_glibc: {
             srcs: [":py3-stdlib-prebuilt-srcs"],
         },
         darwin: {