diff options
author | Matthew Maurer <mmaurer@google.com> | 2020-07-01 23:11:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 23:11:26 +0000 |
commit | f1860424d39b4de51c6f3a279b4dfd82a08944f5 (patch) | |
tree | b9d2947da83fa557df4710362416b453b66c8ae6 | |
parent | 54b0b4e3dadaa9b9d4983279952c82f2b4bd280d (diff) | |
parent | 132546ae6f69f6eb9d938aec8772aa1de8319314 (diff) | |
download | slab-f1860424d39b4de51c6f3a279b4dfd82a08944f5.tar.gz |
Update to use flexible dependencies am: 40c490a237 am: f7aba79987 am: 132546ae6f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/slab/+/1349495
Change-Id: Ia64502848e0a9160c877137e207318d681874a91
-rw-r--r-- | Android.bp | 37 |
1 files changed, 13 insertions, 24 deletions
@@ -1,9 +1,6 @@ // This file is generated by cargo2android.py --run --device --tests. -// Manually split host and device tests, -// and link in static libraries for device tests. -// But, device tests cannot link with both libstd.static and libslab. -rust_library_rlib { +rust_library { name: "libslab", host_supported: true, crate_name: "slab", @@ -27,11 +24,6 @@ rust_test { test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", - rlibs: [ - "libstd.static", - "libtest.static", - "libterm.static", - ], } rust_test_host { @@ -41,22 +33,19 @@ rust_test_host { test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", - rlibs: [ + rustlibs: [ "libslab", ], } -// rust_test { -// name: "slab_device_tests_slab1", -// crate_name: "slab", -// srcs: ["tests/slab.rs"], -// test_suites: ["general-tests"], -// auto_gen_config: true, -// edition: "2015", -// rlibs: [ -// "libslab", -// "libstd.static", -// "libtest.static", -// "libterm.static", -// ], -// } +rust_test { + name: "slab_device_tests_slab1", + crate_name: "slab", + srcs: ["tests/slab.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2015", + rustlibs: [ + "libslab", + ], +} |