diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:27 +0000 |
| commit | bfc892909c6dbec1c8e3f1e95ba1afeeb2c444b5 (patch) | |
| tree | 00f6e9d07b020c077f6647cf415c577b69a7eb84 | |
| parent | f7ba471a8a5b97b8cecfb5dedccbf7d6bb4ac670 (diff) | |
| parent | 9920e1e7dd7d99be7dce77329ef6dd1c451e7469 (diff) | |
| download | shared_child-bfc892909c6dbec1c8e3f1e95ba1afeeb2c444b5.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c5722320e4 am: 437766fe0b am: a0b93304df am: 9920e1e7dd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_child/+/1912833
Change-Id: Iac5f8aeb596b1f445849e32223c55fc0ecd3b608
| -rw-r--r-- | Android.bp | 28 | ||||
| -rw-r--r-- | TEST_MAPPING | 10 |
2 files changed, 19 insertions, 19 deletions
@@ -22,6 +22,8 @@ rust_library { name: "libshared_child", host_supported: true, crate_name: "shared_child", + cargo_env_compat: true, + cargo_pkg_version: "0.3.5", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -34,30 +36,20 @@ rust_library { ], } -rust_defaults { - name: "shared_child_defaults", +rust_test { + name: "shared_child_test_src_lib", + host_supported: true, crate_name: "shared_child", + cargo_env_compat: true, + cargo_pkg_version: "0.3.5", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", rustlibs: [ "liblibc", ], } - -rust_test_host { - name: "shared_child_host_test_src_lib", - defaults: ["shared_child_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "shared_child_device_test_src_lib", - defaults: ["shared_child_defaults"], -} - -// dependent_library ["feature_list"] -// libc-0.2.94 "default,std" diff --git a/TEST_MAPPING b/TEST_MAPPING index 94d2224..078d2ff 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,7 +2,15 @@ { "presubmit": [ { - "name": "shared_child_device_test_src_lib" + "name": "shared_child_test_src_lib" + }, + { + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "shared_child_test_src_lib" }, { "name": "virtualizationservice_device_test" |