Add more files to the musl sysroot for rustc builds am: 76db034975 am: 8d59cc3dff am: 4a185dd7b5 am: 290db7ffda am: a928408439
Original change: https://android-review.googlesource.com/c/platform/external/musl/+/2063092
Change-Id: Ib56e8e699e1caf221c9b258562ef699184e46a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 4dcff0c..d6d7c64 100644
--- a/Android.bp
+++ b/Android.bp
@@ -723,6 +723,7 @@
":libc_musl_static",
":libc++abi",
":libc++",
+ ":libc++_static",
// Objects
":libc_musl_crti",
@@ -730,6 +731,8 @@
":libc_musl_crt1",
":libc_musl_rcrt1",
":libc_musl_Scrt1",
+ ":clang_rt.crtbegin",
+ ":clang_rt.crtend",
// Embedded linker objects and linker scripts
":libc_musl_linker_object",
@@ -796,10 +799,14 @@
" -f $(location :libc_musl_sysroot_static_empty) " +
" -f $(genDir)/Scrt1.ld " +
" -f $(location :libc_musl_Scrt1) " +
+ " -f $(location :libc++_static) " +
+ " -f $(location :clang_rt.crtbegin) " +
+ " -f $(location :clang_rt.crtend) " +
" && " +
"$(location zip2zip) -i $(genDir)/libs.zip -o $(genDir)/libs_renamed.zip " +
// rename libs from module names to desired names in sysroot
" lib/libc_musl_static.a:lib/libc.a " +
+ " lib/libc++_static.a:lib/libc++.a " +
// Swap in linker script for Scrt1.o
" lib/Scrt1.o:lib/Scrt1-real.o " +
" lib/Scrt1.ld:lib/Scrt1.o " +
@@ -812,6 +819,12 @@
" lib/libc_musl_sysroot_static_empty.a:lib/librt.a " +
" lib/libc_musl_sysroot_static_empty.a:lib/libutil.a " +
" lib/libc_musl_sysroot_static_empty.a:lib/libxnet.a " +
+ // rename clang crt objects to gcc names
+ " lib/clang_rt.crtbegin.o:lib/crtbegin.o " +
+ " lib/clang_rt.crtbegin.o:lib/crtbeginS.o " +
+ " lib/clang_rt.crtbegin.o:lib/crtbeginT.o " +
+ " lib/clang_rt.crtend.o:lib/crtend.o " +
+ " lib/clang_rt.crtend.o:lib/crtendS.o " +
" && " +
"$(location merge_zips) -ignore-duplicates $(out) " +
" $(location :libc_musl_sysroot_bionic_headers) " +
