diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:09 +0000 |
commit | 636f7b230692dca2912cba39a409aec4f5df299a (patch) | |
tree | bddc9954969fb66e94cefcf1c4ec72ef15fcf4e2 | |
parent | 670d6e2825975bad56c9fd0d637a7945405baf3d (diff) | |
parent | 3cdd34c596ace3e34fce82eecbf1ac8af992a84c (diff) | |
download | android_logger-636f7b230692dca2912cba39a409aec4f5df299a.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 59328ee8c8 am: de8d81fcc5 am: 1ba6ad0fe7 am: 3cdd34c596
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_logger/+/1912596
Change-Id: I453fb1a5f54b1056444fa4d35d2742c5d69c12bf
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | TEST_MAPPING | 69 | ||||
-rw-r--r-- | cargo2android.json | 8 |
3 files changed, 69 insertions, 16 deletions
@@ -40,7 +40,7 @@ license { } rust_test { - name: "android_logger_device_test_src_lib", + name: "android_logger_test_src_lib", crate_name: "android_logger", cargo_env_compat: true, cargo_pkg_version: "0.10.1", @@ -82,19 +82,19 @@ rust_defaults { } rust_test { - name: "android_logger_device_test_tests_config_log_level", + name: "android_logger_test_tests_config_log_level", defaults: ["android_logger_test_defaults"], srcs: ["tests/config_log_level.rs"], } rust_test { - name: "android_logger_device_test_tests_default_init", + name: "android_logger_test_tests_default_init", defaults: ["android_logger_test_defaults"], srcs: ["tests/default_init.rs"], } rust_test { - name: "android_logger_device_test_tests_multiple_init", + name: "android_logger_test_tests_multiple_init", defaults: ["android_logger_test_defaults"], srcs: ["tests/multiple_init.rs"], } diff --git a/TEST_MAPPING b/TEST_MAPPING index 0eed2f8..7fc7922 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,16 +2,16 @@ { "presubmit": [ { - "name": "android_logger_device_test_src_lib" + "name": "android_logger_test_src_lib" }, { - "name": "android_logger_device_test_tests_config_log_level" + "name": "android_logger_test_tests_config_log_level" }, { - "name": "android_logger_device_test_tests_default_init" + "name": "android_logger_test_tests_default_init" }, { - "name": "android_logger_device_test_tests_multiple_init" + "name": "android_logger_test_tests_multiple_init" }, { "name": "authfs_device_test_src_lib" @@ -29,21 +29,74 @@ "name": "keystore2_test" }, { - "name": "logger_device_test_config_log_level" + "name": "logger_device_unit_tests" + }, + { + "name": "logger_test_config_log_level" }, { - "name": "logger_device_test_default_init" + "name": "logger_test_default_init" }, { - "name": "logger_device_test_env_log_level" + "name": "logger_test_env_log_level" }, { - "name": "logger_device_test_multiple_init" + "name": "logger_test_multiple_init" + }, + { + "name": "open_then_run_module" + }, + { + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "android_logger_test_src_lib" + }, + { + "name": "android_logger_test_tests_config_log_level" + }, + { + "name": "android_logger_test_tests_default_init" + }, + { + "name": "android_logger_test_tests_multiple_init" + }, + { + "name": "authfs_device_test_src_lib" + }, + { + "name": "doh_unit_test" + }, + { + "name": "keystore2_selinux_concurrency_test" + }, + { + "name": "keystore2_selinux_test" + }, + { + "name": "keystore2_test" }, { "name": "logger_device_unit_tests" }, { + "name": "logger_test_config_log_level" + }, + { + "name": "logger_test_default_init" + }, + { + "name": "logger_test_env_log_level" + }, + { + "name": "logger_test_multiple_init" + }, + { + "name": "open_then_run_module" + }, + { "name": "virtualizationservice_device_test" } ] diff --git a/cargo2android.json b/cargo2android.json index ef082bb..6d53642 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -6,11 +6,11 @@ "com.android.uwb", "com.android.virt" ], - "min_sdk_version": "29", - "vendor_available": true, "dependencies": true, "device": true, + "min-sdk-version": "29", "no-host": true, "run": true, - "tests": true -} + "tests": true, + "vendor-available": true +}
\ No newline at end of file |