Migrate to cargo_embargo. am: bbe92c08da am: bb3271f501 am: 6e930c0a72
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/buddy_system_allocator/+/2799496
Change-Id: I40049f480ce85498efecbb22d05afcaf65cd0873
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index f25a29d..886e493 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -32,9 +32,7 @@
"spin",
"use_spin",
],
- rustlibs: [
- "libspin_nostd",
- ],
+ rustlibs: ["libspin_nostd"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 07981d1..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "alloc": true,
- "dependencies": true,
- "dep-suffixes": {
- "byteorder": "_nostd",
- "spin": "_nostd"
- },
- "device": true,
- "force-rlib": true,
- "no-host": true,
- "no-std": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9280162
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,15 @@
+{
+ "module_name_overrides": {
+ "libbyteorder": "libbyteorder_nostd",
+ "libspin": "libspin_nostd"
+ },
+ "package": {
+ "buddy_system_allocator": {
+ "alloc": true,
+ "host_supported": false,
+ "force_rlib": true,
+ "no_std": true
+ }
+ },
+ "run_cargo": false
+}
