diff options
author | Andrew Walbran <qwandor@google.com> | 2023-10-24 18:30:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-24 18:30:44 +0000 |
commit | 237e7e9fb08b174928b8727a602ee28645fdc733 (patch) | |
tree | c856af15375b401f24ac59ed57677ed132d2448e | |
parent | 936d96d1b716cc0b07e8c9ed5a4505769d239bc6 (diff) | |
parent | bbe92c08da55411c165d0c08d9e6c7f41d464d20 (diff) | |
download | buddy_system_allocator-237e7e9fb08b174928b8727a602ee28645fdc733.tar.gz |
Migrate to cargo_embargo. am: bbe92c08da
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/buddy_system_allocator/+/2799496
Change-Id: I08dbced6890387a42e3d2040bbcd68a1c903dda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 13 | ||||
-rw-r--r-- | cargo_embargo.json | 15 |
3 files changed, 17 insertions, 17 deletions
@@ -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 @@ rust_library_rlib { "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 +} |