aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Clément Tosi <ptosi@google.com>2023-10-26 14:35:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-26 14:35:05 +0000
commit3fd02cd79c25c45d50af8e3c31b8c63e6d0de438 (patch)
tree4470f0b8f291323517b3bfd8bfe41cebe66c0dac
parentdce0bb7aa757b401b142d92bc7daf37830345cb2 (diff)
parentbc2fc0293218a160fe9005d0186e314af04bebc2 (diff)
downloadaarch64-paging-3fd02cd79c25c45d50af8e3c31b8c63e6d0de438.tar.gz
Android.bp: Mark crate no_std am: a2d5b75f4d am: 002766bb0f am: bc2fc02932
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/aarch64-paging/+/2804174 Change-Id: Ib8293658b4bd938efb9efd8da88b2193792ad0f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp9
-rw-r--r--cargo_embargo.json3
2 files changed, 11 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 59675b5..5255673 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,7 +66,7 @@ rust_test {
},
}
-rust_library {
+rust_library_rlib {
name: "libaarch64_paging",
host_supported: true,
crate_name: "aarch64_paging",
@@ -83,6 +83,13 @@ rust_library {
"//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,
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"
}
},