Merge "Revert "Tweak linux_glibc properties for musl builds in external/python/cpython3"" am: 063970b3cb am: 012b62c548
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2027548
Change-Id: Iad28cb48898a47ba46c12a7ef5993d0c3430a3ca
diff --git a/Android.bp b/Android.bp
index 209f4e7..13e7096 100644
--- a/Android.bp
+++ b/Android.bp
@@ -71,7 +71,7 @@
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 @@
linux_glibc: {
enabled: false,
},
- linux_musl: {
- enabled: false,
- },
darwin: {
enabled: false,
},
@@ -97,9 +94,6 @@
linux_glibc: {
enabled: true,
},
- linux_musl: {
- enabled: true,
- },
darwin: {
enabled: true,
},
@@ -173,17 +167,10 @@
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 @@
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 @@
"-framework SystemConfiguration",
"-framework CoreFoundation",
],
+ static_libs: [
+ "libopenssl_ssl",
+ "libopenssl_crypto",
+ ],
},
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",
],
},
android: {
@@ -439,9 +425,6 @@
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 @@
"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 3b9c289..8656f5c 100644
--- a/Lib/Android.bp
+++ b/Lib/Android.bp
@@ -76,11 +76,7 @@
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 @@
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: {