diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-06-02 13:38:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-02 13:38:51 +0000 |
| commit | 619be50981219e372e3e4f71be22a8acbe5701dc (patch) | |
| tree | ea70d954d661d2cd8415f32097c5a20398c35d39 | |
| parent | 5aa546cd8a67741e4fa43b77b550cb1309c53a40 (diff) | |
| parent | 21f4df476a2a706cef4f2ed262f9a6219da15693 (diff) | |
| download | buddy_system_allocator-619be50981219e372e3e4f71be22a8acbe5701dc.tar.gz | |
Use new no-std flag to cargo2android. am: 6159b18b27 am: 2078c14613 am: 71743a210b am: 21f4df476a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/buddy_system_allocator/+/2586925
Change-Id: Id447654b53e475c7b7f6ef3f7ff8c8fb3f784373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 13 insertions, 15 deletions
@@ -22,7 +22,6 @@ license { 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 @@ rust_library_rlib { "//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", |