commit 3597555cb9a93309c1e5652462c11552dd5fda52
author Colin Cross <ccross@android.com> Wed Mar 09 00:14:16 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 09 00:14:16 2022 +0000
tree 151a94800afd2756759a738b1629e6b82d9db338
parent d8841033df9e1cfe555d72b54e7e6ce951244150
parent 5a739473a0a5ee71794bb7c826a8e5fb103b7e20

Build static python launchers when targeting musl am: 5a739473a0

Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/2016820

Change-Id: Ib87bdfd3c32a50d7552ce07d8cb7745987301fc2

build-prebuilts.sh

diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 0bbb4ef..dafa8e3 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -112,6 +112,10 @@
         ziptime
         ziptool
     )
+    SOONG_MUSL_BINARIES=(
+        py3-launcher-static64
+        py3-launcher-autorun-static64
+    )
     SOONG_ASAN_BINARIES=(
         acp
         aidl
@@ -150,6 +154,7 @@
     musl_sysroot32=""
     musl_sysroot64=""
     if [[ ${use_musl} = "true" ]]; then
+        binaries="${binaries} ${SOONG_MUSL_BINARIES[@]/#/${SOONG_HOST_OUT}/bin/}"
         musl_sysroot32="${SOONG_OUT}/.intermediates/external/musl/libc_musl_sysroot/linux_musl_x86/gen/libc_musl_sysroot.zip"
         musl_sysroot64="${SOONG_OUT}/.intermediates/external/musl/libc_musl_sysroot/linux_musl_x86_64/gen/libc_musl_sysroot.zip"
     fi