diff options
| author | Colin Cross <ccross@android.com> | 2022-03-15 23:32:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-15 23:32:29 +0000 |
| commit | 80d3df0782445a88c1239554f53e94bcc08419e5 (patch) | |
| tree | ac622b504d672fbb8a71f7b35cff965ed5ceffe8 | |
| parent | 7e37b457ae08d4a3f576bd830e3b3323b8d3c145 (diff) | |
| parent | 5796352143446ee5e9bda3d9265cf05f640250da (diff) | |
| download | cpython2-80d3df0782445a88c1239554f53e94bcc08419e5.tar.gz | |
Tweak linux_glibc properties for musl builds in external/python/cpython2 am: fc6603babf am: 5796352143
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538
Change-Id: Icce6090b08352b89bde188aeb4a0d5a919130e58
| -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", |