diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-17 02:58:10 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-17 02:58:10 +0000 |
commit | 8f7c2b9fbc1522e1046ccc023317e47673212715 (patch) | |
tree | c74b20ca161629a8b72775f645f6948a47934166 | |
parent | fa5336736196b431a81aaa392e084d6f4ae3c19b (diff) | |
parent | 15236643ed9d4590fd131a00b7582edfbcbffd7b (diff) | |
download | pin-utils-android13-frc-media-swcodec-release.tar.gz |
Snap for 8191477 from 15236643ed9d4590fd131a00b7582edfbcbffd7b to tm-frc-media-swcodec-releaset_frc_swc_330443040t_frc_swc_330443010android13-frc-media-swcodec-release
Change-Id: I527896c6f8466de9d9e029e4e3ae7299d26294e7
-rw-r--r-- | Android.bp | 53 | ||||
-rw-r--r-- | TEST_MAPPING | 50 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 61 insertions, 47 deletions
@@ -41,10 +41,13 @@ rust_library { name: "libpin_utils", host_supported: true, crate_name: "pin_utils", + cargo_env_compat: true, + cargo_pkg_version: "0.1.0", srcs: ["src/lib.rs"], edition: "2018", apex_available: [ "//apex_available:platform", + "com.android.bluetooth", "com.android.resolv", "com.android.virt", ], @@ -52,30 +55,10 @@ rust_library { } rust_defaults { - name: "pin-utils_defaults", - crate_name: "pin_utils", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", -} - -rust_test_host { - name: "pin-utils_host_test_src_lib", - defaults: ["pin-utils_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "pin-utils_device_test_src_lib", - defaults: ["pin-utils_defaults"], -} - -rust_defaults { - name: "pin-utils_defaults_pin_utils", + name: "pin-utils_test_defaults", crate_name: "pin_utils", + cargo_env_compat: true, + cargo_pkg_version: "0.1.0", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -84,9 +67,10 @@ rust_defaults { ], } -rust_test_host { - name: "pin-utils_host_test_tests_projection", - defaults: ["pin-utils_defaults_pin_utils"], +rust_test { + name: "pin-utils_test_tests_projection", + defaults: ["pin-utils_test_defaults"], + host_supported: true, srcs: ["tests/projection.rs"], test_options: { unit_test: true, @@ -94,22 +78,11 @@ rust_test_host { } rust_test { - name: "pin-utils_device_test_tests_projection", - defaults: ["pin-utils_defaults_pin_utils"], - srcs: ["tests/projection.rs"], -} - -rust_test_host { - name: "pin-utils_host_test_tests_stack_pin", - defaults: ["pin-utils_defaults_pin_utils"], + name: "pin-utils_test_tests_stack_pin", + defaults: ["pin-utils_test_defaults"], + host_supported: true, srcs: ["tests/stack_pin.rs"], test_options: { unit_test: true, }, } - -rust_test { - name: "pin-utils_device_test_tests_stack_pin", - defaults: ["pin-utils_defaults_pin_utils"], - srcs: ["tests/stack_pin.rs"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index c19c652..e517942 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,17 +1,57 @@ -// Generated by cargo2android.py for tests in Android.bp +// Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/anyhow" + }, + { + "path": "external/rust/crates/futures-util" + }, + { + "path": "external/rust/crates/tokio" + }, + { + "path": "external/rust/crates/tokio-test" + } + ], "presubmit": [ { - "name": "pin-utils_device_test_src_lib" + "name": "ZipFuseTest" + }, + { + "name": "authfs_device_test_src_lib" + }, + { + "name": "doh_unit_test" + }, + { + "name": "pin-utils_test_tests_projection" + }, + { + "name": "pin-utils_test_tests_stack_pin" + }, + { + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" + }, + { + "name": "authfs_device_test_src_lib" + }, + { + "name": "doh_unit_test" }, { - "name": "pin-utils_device_test_tests_projection" + "name": "pin-utils_test_tests_projection" }, { - "name": "pin-utils_device_test_tests_stack_pin" + "name": "pin-utils_test_tests_stack_pin" }, { - "name": "futures-util_device_test_src_lib" + "name": "virtualizationservice_device_test" } ] } diff --git a/cargo2android.json b/cargo2android.json index 44e747c..5b266a6 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,12 +1,13 @@ { "apex-available": [ "//apex_available:platform", + "com.android.bluetooth", "com.android.resolv", "com.android.virt" ], - "min_sdk_version": "29", "dependencies": true, "device": true, + "min-sdk-version": "29", "run": true, "tests": true -}
\ No newline at end of file +} |