Add more files to the musl sysroot for rustc builds am: 76db034975 am: 8d59cc3dff am: 4a185dd7b5 am: 290db7ffda am: a928408439android-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_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_r32android13-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-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release

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>

1 files changed, 13 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 4dcff0c4..d6d7c642 100644
--- a/Android.bp
+++ b/Android.bp
@@ -723,6 +723,7 @@ cc_genrule {
         ":libc_musl_static",
         ":libc++abi",
         ":libc++",
+        ":libc++_static",
 
         // Objects
         ":libc_musl_crti",
@@ -730,6 +731,8 @@ cc_genrule {
         ":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 @@ cc_genrule {
         "  -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 @@ cc_genrule {
         " 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) " +