commit a2d5b75f4d5acabbbfd8c8ff8279c5a29a1d3479
author Pierre-Clément Tosi <ptosi@google.com> Wed Oct 25 17:21:31 2023 +0100
committer Pierre-Clément Tosi <ptosi@google.com> Thu Oct 26 09:29:51 2023 +0100
tree 4470f0b8f291323517b3bfd8bfe41cebe66c0dac
parent fdbe7c8a601c188d32b9259777082a5a77dbf82f

Android.bp: Mark crate no_std

Use cargo_embargo to generate the Android.bp change.

Test: m libaarch64_paging
Change-Id: Ie11e617a94ca1c1b3fd49ba6742eda03f942478c

Android.bp

diff --git a/Android.bp b/Android.bp
index 59675b5..5255673 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,7 +66,7 @@
     },
 }
 
-rust_library {
+rust_library_rlib {
     name: "libaarch64_paging",
     host_supported: true,
     crate_name: "aarch64_paging",
@@ -83,6 +83,13 @@
         "//apex_available:platform",
         "com.android.virt",
     ],
+    prefer_rlib: true,
+    no_stdlibs: true,
+    stdlibs: [
+        "liballoc.rust_sysroot",
+        "libcompiler_builtins.rust_sysroot",
+        "libcore.rust_sysroot",
+    ],
     product_available: true,
     vendor_available: true,
     enabled: false,

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
index e9f4935..e403355 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -6,6 +6,9 @@
   ],
   "package": {
     "aarch64-paging": {
+      "alloc": true,
+      "no_std": true,
+      "force_rlib": true,
       "add_module_block": "cargo2android_module.bp"
     }
   },