diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2020-07-14 02:04:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-14 02:04:43 +0000 |
| commit | 227e0fabc9f5756df349e6bd998c95d42b2e0af2 (patch) | |
| tree | 01834bcf0e76d513cfdf55ab9d0cd6de5690154f | |
| parent | 0f0797ee25447c3cf6a5ddc34de8d9258b01095a (diff) | |
| parent | 65ec2cb4e9148524119d28ae69bcf6611dad45d9 (diff) | |
| download | slab-227e0fabc9f5756df349e6bd998c95d42b2e0af2.tar.gz | |
Regenerate Android.bp with new cargo2android.py am: b6baf69d32 am: 65ec2cb4e9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/slab/+/1362336
Change-Id: I28d773c0741367c66f5e6c9fd01a3e9258f77d51
| -rw-r--r-- | Android.bp | 41 | ||||
| -rw-r--r-- | TEST_MAPPING | 8 |
2 files changed, 25 insertions, 24 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests. +// This file is generated by cargo2android.py --run --device --tests --dependencies. rust_library { name: "libslab", @@ -8,28 +8,29 @@ rust_library { edition: "2015", } -rust_test_host { - name: "slab_host_tests_slab", +rust_defaults { + name: "slab_defaults", crate_name: "slab", - srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", } +rust_test_host { + name: "slab_host_test_src_lib", + defaults: ["slab_defaults"], + srcs: ["src/lib.rs"], +} + rust_test { - name: "slab_device_tests_slab", - crate_name: "slab", + name: "slab_device_test_src_lib", + defaults: ["slab_defaults"], srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", } -rust_test_host { - name: "slab_host_tests_slab1", +rust_defaults { + name: "slab_defaults1", crate_name: "slab", - srcs: ["tests/slab.rs"], test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", @@ -38,14 +39,14 @@ rust_test_host { ], } +rust_test_host { + name: "slab_host_test_tests_slab", + defaults: ["slab_defaults1"], + srcs: ["tests/slab.rs"], +} + rust_test { - name: "slab_device_tests_slab1", - crate_name: "slab", + name: "slab_device_test_tests_slab", + defaults: ["slab_defaults1"], srcs: ["tests/slab.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", - rustlibs: [ - "libslab", - ], } diff --git a/TEST_MAPPING b/TEST_MAPPING index 40400ae..81e461a 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,18 +1,18 @@ { "presubmit": [ { - "name": "slab_host_tests_slab", + "name": "slab_host_test_src_lib", "host": true }, { - "name": "slab_device_tests_slab" + "name": "slab_device_test_src_lib" }, { - "name": "slab_host_tests_slab1", + "name": "slab_host_test_tests_slab", "host": true }, { - "name": "slab_device_tests_slab1" + "name": "slab_device_test_tests_slab" } ] } |