diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:02:44 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:02:44 +0000 |
commit | 54c114d93c664dc55dca66df7a3e2ef82ea9a0b5 (patch) | |
tree | a30cdb39a2b4dbd583f1ae45932154ca56603f4c | |
parent | 518fec22855a71395e7d36a3ef00198fb50302be (diff) | |
parent | 0355e42c3d36eec9f7ad4cf3f5aaa6d89a52c33d (diff) | |
download | downcast-rs-android13-mainline-wifi-release.tar.gz |
Snap for 8564071 from 0355e42c3d36eec9f7ad4cf3f5aaa6d89a52c33d to mainline-wifi-releaseaml_wif_331910020aml_wif_331810010aml_wif_331710030aml_wif_331613000aml_wif_331511020aml_wif_331414000aml_wif_331310070aml_wif_331112000aml_wif_331016070aml_wif_330910030aml_wif_330810040android13-mainline-wifi-release
Change-Id: I1df3de31b57933fdfe117d2122ec11f5878d7012
-rw-r--r-- | Android.bp | 57 | ||||
-rw-r--r-- | TEST_MAPPING | 109 | ||||
-rw-r--r-- | cargo2android.json | 6 |
3 files changed, 138 insertions, 34 deletions
@@ -24,12 +24,18 @@ license { ], } -rust_defaults { - name: "downcast-rs_defaults", +rust_test { + name: "downcast-rs_test_src_lib", + host_supported: true, crate_name: "downcast_rs", + cargo_env_compat: true, + cargo_pkg_version: "1.2.0", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -37,22 +43,11 @@ rust_defaults { ], } -rust_test_host { - name: "downcast-rs_host_test_src_lib", - defaults: ["downcast-rs_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "downcast-rs_device_test_src_lib", - defaults: ["downcast-rs_defaults"], -} - rust_defaults { - name: "downcast-rs_defaults_downcast_rs", + name: "downcast-rs_test_defaults", crate_name: "downcast_rs", + cargo_env_compat: true, + cargo_pkg_version: "1.2.0", test_suites: ["general-tests"], auto_gen_config: true, edition: "2015", @@ -65,9 +60,10 @@ rust_defaults { ], } -rust_test_host { - name: "downcast-rs_host_test_tests_import_via_macro_use", - defaults: ["downcast-rs_defaults_downcast_rs"], +rust_test { + name: "downcast-rs_test_tests_import_via_macro_use", + defaults: ["downcast-rs_test_defaults"], + host_supported: true, srcs: ["tests/import_via_macro_use.rs"], test_options: { unit_test: true, @@ -75,30 +71,21 @@ rust_test_host { } rust_test { - name: "downcast-rs_device_test_tests_import_via_macro_use", - defaults: ["downcast-rs_defaults_downcast_rs"], - srcs: ["tests/import_via_macro_use.rs"], -} - -rust_test_host { - name: "downcast-rs_host_test_tests_use_via_namespace", - defaults: ["downcast-rs_defaults_downcast_rs"], + name: "downcast-rs_test_tests_use_via_namespace", + defaults: ["downcast-rs_test_defaults"], + host_supported: true, srcs: ["tests/use_via_namespace.rs"], test_options: { unit_test: true, }, } -rust_test { - name: "downcast-rs_device_test_tests_use_via_namespace", - defaults: ["downcast-rs_defaults_downcast_rs"], - srcs: ["tests/use_via_namespace.rs"], -} - rust_library { name: "libdowncast_rs", host_supported: true, crate_name: "downcast_rs", + cargo_env_compat: true, + cargo_pkg_version: "1.2.0", srcs: ["src/lib.rs"], edition: "2015", features: [ @@ -107,6 +94,10 @@ rust_library { ], apex_available: [ "//apex_available:platform", + "com.android.compos", + "com.android.uwb", "com.android.virt", ], + vendor_available: true, + min_sdk_version: "29", } diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 0000000..6d13348 --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,109 @@ +// Generated by update_crate_tests.py for tests that depend on this crate. +{ + "presubmit": [ + { + "name": "authfs_device_test_src_lib" + }, + { + "name": "diced_open_dice_cbor_test" + }, + { + "name": "diced_sample_inputs_test" + }, + { + "name": "diced_test" + }, + { + "name": "diced_utils_test" + }, + { + "name": "diced_vendor_test" + }, + { + "name": "downcast-rs_test_src_lib" + }, + { + "name": "downcast-rs_test_tests_import_via_macro_use" + }, + { + "name": "downcast-rs_test_tests_use_via_namespace" + }, + { + "name": "keystore2_km_compat_test" + }, + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "libbinder_rs-internal_test" + }, + { + "name": "microdroid_manager_test" + }, + { + "name": "rustBinderTest" + }, + { + "name": "rustBinderTestService" + }, + { + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "authfs_device_test_src_lib" + }, + { + "name": "diced_open_dice_cbor_test" + }, + { + "name": "diced_sample_inputs_test" + }, + { + "name": "diced_test" + }, + { + "name": "diced_utils_test" + }, + { + "name": "diced_vendor_test" + }, + { + "name": "downcast-rs_test_src_lib" + }, + { + "name": "downcast-rs_test_tests_import_via_macro_use" + }, + { + "name": "downcast-rs_test_tests_use_via_namespace" + }, + { + "name": "keystore2_km_compat_test" + }, + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "libbinder_rs-internal_test" + }, + { + "name": "microdroid_manager_test" + }, + { + "name": "rustBinderTest" + }, + { + "name": "rustBinderTestService" + }, + { + "name": "virtualizationservice_device_test" + } + ] +} diff --git a/cargo2android.json b/cargo2android.json index ac56e26..d5077e9 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,10 +1,14 @@ { "apex-available": [ "//apex_available:platform", + "com.android.compos", + "com.android.uwb", "com.android.virt" ], "dependencies": true, "device": true, + "min-sdk-version": "29", "run": true, - "tests": true + "tests": true, + "vendor-available": true }
\ No newline at end of file |