diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:10 +0000 |
| commit | 4001021eb44a3c7f29791c9b4ab30151cc06ed6e (patch) | |
| tree | 48af30bff436892b7b4a7c3cb05b748be92e6450 | |
| parent | 15ac8fae5044e640b957a6063b53a8f6d9d612fa (diff) | |
| parent | e7e3490c32bc17b9274ccbfe6e4356a993af59d4 (diff) | |
| download | intrusive-collections-4001021eb44a3c7f29791c9b4ab30151cc06ed6e.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e7e3490c32
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/intrusive-collections/+/1912604
Change-Id: Ia407ec6be19a057ce775051ee232e908283ec314
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | TEST_MAPPING | 11 |
2 files changed, 13 insertions, 4 deletions
@@ -44,6 +44,8 @@ rust_library { // has rustc warnings host_supported: true, crate_name: "intrusive_collections", + cargo_env_compat: true, + cargo_pkg_version: "0.9.2", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -58,7 +60,3 @@ rust_library { "com.android.virt", ], } - -// dependent_library ["feature_list"] -// autocfg-1.0.1 -// memoffset-0.5.6 "default" diff --git a/TEST_MAPPING b/TEST_MAPPING index 028fa2a..fc8ec65 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -10,5 +10,16 @@ { "name": "virtualizationservice_device_test" } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" + }, + { + "name": "authfs_device_test_src_lib" + }, + { + "name": "virtualizationservice_device_test" + } ] } |