commit 9f2f4463aa048cde5e0a9f016e6fa7fd32263953
author Pierre-Clément Tosi <ptosi@google.com> Fri Dec 09 19:13:29 2022 +0000
committer Pierre-Clément Tosi <ptosi@google.com> Wed Dec 14 10:54:03 2022 +0000
tree 9b7aadabb1f052648da33d7b6613c85d12381ac7
parent 63dd9e28ef1badd211f84107895ce6a9e713110b

libvmbase: Replace ARM routines with Bionic deps

Use the arch-agnostic library now provided by libc/Bionic for the C
dependencies that LLVM adds to baremetal Rust code.

Test: m pvmfw_img && atest vmbase_example.integration_test
Change-Id: I19f90b76515569331a99601b5bc433ea5851ab81

vmbase/Android.bp

diff --git a/vmbase/Android.bp b/vmbase/Android.bp
index 7a36a0a..5ed436c 100644
--- a/vmbase/Android.bp
+++ b/vmbase/Android.bp
@@ -68,7 +68,7 @@
         "libspin_nostd",
     ],
     whole_static_libs: [
-        "libarm-optimized-routines-mem",
+        "librust_baremetal",
     ],
     apex_available: ["com.android.virt"],
 }