Use new no-std flag to cargo2android. am: 6159b18b27 am: 2078c14613 am: 71743a210b am: 21f4df476a am: 619be50981
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/buddy_system_allocator/+/2586925
Change-Id: Id09135cfb24458a498de9c85b4977cd3633d426e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 0b7c95c..f25a29d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,7 +22,6 @@
rust_library_rlib {
name: "libbuddy_system_allocator",
- host_supported: true,
crate_name: "buddy_system_allocator",
cargo_env_compat: true,
cargo_pkg_version: "0.9.0",
@@ -40,4 +39,13 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ prefer_rlib: true,
+ no_stdlibs: true,
+ stdlibs: [
+ "liballoc.rust_sysroot",
+ "libcompiler_builtins.rust_sysroot",
+ "libcore.rust_sysroot",
+ ],
+ product_available: true,
+ vendor_available: true,
}
diff --git a/cargo2android.json b/cargo2android.json
index 1b9849e..b80410f 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,10 @@
{
+ "alloc": true,
"dependencies": true,
+ "dependency-suffix": "_nostd",
"device": true,
"force-rlib": true,
- "patch": "patches/Android.bp.patch",
+ "no-host": true,
+ "no-std": true,
"run": true
}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 58b4878..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index bbd9e06..6dae9e8 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -61,7 +61,7 @@ rust_library_rlib {
- "use_spin",
- ],
- rustlibs: [
-- "libspin",
-+ "libspin_nostd",
- ],
- apex_available: [
- "//apex_available:platform",
