diff options
| author | Colin Cross <ccross@android.com> | 2022-03-15 22:37:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-15 22:37:46 +0000 |
| commit | 5422680739bdc6a9726e601fd480f12910ec325a (patch) | |
| tree | 4c4ff45c9a774315c5f4e505fa78a23f560456d2 | |
| parent | 800f1aa8a14119ac4b9a234222814a8931d54440 (diff) | |
| parent | 3d66d9b005bdf388e6c78c14ec5ec7f49ccba27b (diff) | |
| download | cpython3-5422680739bdc6a9726e601fd480f12910ec325a.tar.gz | |
Merge "Tweak linux_glibc properties for musl builds in external/python/cpython3" am: aa89b51b9c am: ebd5945cf7 am: 3d66d9b005
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2018608
Change-Id: I3a72374798c1e5a39a4b6ef78a8d40af1bcd9028
| -rw-r--r-- | Android.bp | 42 | ||||
| -rw-r--r-- | Lib/Android.bp | 14 |
2 files changed, 42 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp index 13e70961a2..209f4e7fc8 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_glibc +// By default, disable the source and use the prebuilts for host linux // and darwin. Overridden by cpython3-interp-force_build_host when // force_build_host is true (set on aosp-build-tools). cc_defaults { @@ -81,6 +81,9 @@ cc_defaults { linux_glibc: { enabled: false, }, + linux_musl: { + enabled: false, + }, darwin: { enabled: false, }, @@ -94,6 +97,9 @@ cc_defaults { linux_glibc: { enabled: true, }, + linux_musl: { + enabled: true, + }, darwin: { enabled: true, }, @@ -167,10 +173,17 @@ 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, }, @@ -358,10 +371,6 @@ 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 @@ -375,15 +384,20 @@ cc_defaults { "-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: { @@ -425,6 +439,9 @@ 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"], }, @@ -510,6 +527,13 @@ 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 8656f5c134..3b9c289d74 100644 --- a/Lib/Android.bp +++ b/Lib/Android.bp @@ -76,7 +76,11 @@ python_defaults { name: "py3-stdlib-force-build", defaults_visibility: ["//visibility:private"], target: { - linux_glibc: { + glibc: { + exclude_srcs: [":py3-stdlib-prebuilt-srcs"], + srcs: [":py3-stdlib-srcs"], + }, + musl: { exclude_srcs: [":py3-stdlib-prebuilt-srcs"], srcs: [":py3-stdlib-srcs"], }, @@ -93,13 +97,13 @@ cpython3_python_stdlib { pkg_path: "stdlib", host_supported: true, target: { - android: { + bionic: { srcs: [":py3-stdlib-srcs"], }, - linux_bionic: { - srcs: [":py3-stdlib-srcs"], + glibc: { + srcs: [":py3-stdlib-prebuilt-srcs"], }, - linux_glibc: { + musl: { srcs: [":py3-stdlib-prebuilt-srcs"], }, darwin: { |