aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-27 03:26:52 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-27 03:26:52 +0000
commit936bb126efd35e0c0f32ef1473f6bfb0e7540e9f (patch)
tree4470f0b8f291323517b3bfd8bfe41cebe66c0dac
parent7513f3406f63e0908009cf5a108b8edae291e57a (diff)
parentd846d14a00e775042889e7cd4db50cc553a34953 (diff)
downloadaarch64-paging-936bb126efd35e0c0f32ef1473f6bfb0e7540e9f.tar.gz
Snap for 11012804 from d846d14a00e775042889e7cd4db50cc553a34953 to 24Q1-release
Change-Id: I6ad8bc12564f1a6301a42a9af2dbfad882c5597a
-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"
}
},