commit 992c2bb50d2b3b387cc210ed01690bb5d2b4152b
author Pierre-Clément Tosi <ptosi@google.com> Wed Oct 02 10:37:42 2024 +0100
committer Pierre-Clément Tosi <ptosi@google.com> Tue Oct 08 17:31:01 2024 +0100
tree af452b901371f50600af3bfc6eafa7343997ebb4
parent 2b8936c7544d86301d883b66932399441d434936

liblibfdt: Add no_std variant for libfdt_baremetal

Add a second rlib that wraps the newly-created libfdt_baremetal
cc_library to ensure that baremetal clients (using the *_nostd library
variants) don't use the non-_baremetal C library. This allows baremetal
code to be compiled with a different set of Clang flags.

Test: m pvmfw
Change-Id: I71b50eeafe257fa6086805ca5a6b4c0de935bb32

guest/pvmfw/Android.bp

diff --git a/guest/pvmfw/Android.bp b/guest/pvmfw/Android.bp
index b502af6..d0d309b 100644
--- a/guest/pvmfw/Android.bp
+++ b/guest/pvmfw/Android.bp
@@ -19,7 +19,7 @@
         "libcstr",
         "libdiced_open_dice_nostd",
         "libfdtpci",
-        "liblibfdt",
+        "liblibfdt_nostd",
         "liblog_rust_nostd",
         "libonce_cell_nostd",
         "libpvmfw_avb_nostd",

guest/rialto/Android.bp

diff --git a/guest/rialto/Android.bp b/guest/rialto/Android.bp
index 4c18bf9..eeb5b2d 100644
--- a/guest/rialto/Android.bp
+++ b/guest/rialto/Android.bp
@@ -15,7 +15,7 @@
         "libcstr",
         "libdiced_open_dice_nostd",
         "libfdtpci",
-        "liblibfdt",
+        "liblibfdt_nostd",
         "liblog_rust_nostd",
         "libservice_vm_comm_nostd",
         "libservice_vm_fake_chain_nostd",

guest/vmbase_example/Android.bp

diff --git a/guest/vmbase_example/Android.bp b/guest/vmbase_example/Android.bp
index ff7bd83..49a6d69 100644
--- a/guest/vmbase_example/Android.bp
+++ b/guest/vmbase_example/Android.bp
@@ -12,7 +12,7 @@
         "libcstr",
         "libdiced_open_dice_nostd",
         "libfdtpci",
-        "liblibfdt",
+        "liblibfdt_nostd",
         "liblog_rust_nostd",
         "libvirtio_drivers",
         "libvmbase",