diff options
author | Colin Cross <ccross@android.com> | 2022-03-15 23:57:45 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-15 23:57:45 +0000 |
commit | 4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e (patch) | |
tree | ac622b504d672fbb8a71f7b35cff965ed5ceffe8 | |
parent | e90d78995e537917f3eaca5479a2efff2893d6b0 (diff) | |
parent | 80d3df0782445a88c1239554f53e94bcc08419e5 (diff) | |
download | cpython2-android13-qpr3-c-s8-release.tar.gz |
Tweak linux_glibc properties for musl builds in external/python/cpython2 am: fc6603babf am: 5796352143 am: 80d3df0782t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538
Change-Id: I7e1c929900f5e55b71d4118ceaddb663d3892463
-rw-r--r-- | Android.bp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index 028957376a..b13d7e417d 100644 --- a/Android.bp +++ b/Android.bp @@ -114,10 +114,17 @@ cc_defaults { 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 @@ cc_library_static { "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", |