diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:23 +0000 |
| commit | 0013abb405847552a88aec049f76321e2f019933 (patch) | |
| tree | 54ae7c6602b6d8f2b8398408e81b2574adf92cb5 | |
| parent | 47e158cdea1036711cdb8a177a19d9415198b9e0 (diff) | |
| parent | dcc8743f37223b074ca4cb7bdd1bff98afa5ab63 (diff) | |
| download | android_log-sys-0013abb405847552a88aec049f76321e2f019933.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 1835194894 am: 2493df40ed am: f66213b796 am: dcc8743f37
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/1912002
Change-Id: I0b4a7fffcb6d5a8e6007fac1fe6243638c2a4ba9
| -rw-r--r-- | TEST_MAPPING | 55 | ||||
| -rw-r--r-- | cargo2android.json | 8 |
2 files changed, 50 insertions, 13 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 14d93ba..37d7815 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,54 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/android_logger" + } + ], "presubmit": [ { "name": "ZipFuseTest" }, { - "name": "android_logger_device_test_src_lib" + "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": "android_logger_device_test_tests_config_log_level" + "name": "logger_test_multiple_init" }, { - "name": "android_logger_device_test_tests_default_init" + "name": "open_then_run_module" }, { - "name": "android_logger_device_test_tests_multiple_init" + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" }, { "name": "authfs_device_test_src_lib" @@ -32,19 +66,22 @@ "name": "keystore2_test" }, { - "name": "logger_device_test_config_log_level" + "name": "logger_device_unit_tests" }, { - "name": "logger_device_test_default_init" + "name": "logger_test_config_log_level" }, { - "name": "logger_device_test_env_log_level" + "name": "logger_test_default_init" }, { - "name": "logger_device_test_multiple_init" + "name": "logger_test_env_log_level" }, { - "name": "logger_device_unit_tests" + "name": "logger_test_multiple_init" + }, + { + "name": "open_then_run_module" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json index 32b2314..0bfe14a 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,9 +7,9 @@ "com.android.uwb", "com.android.virt" ], - "min_sdk_version": "29", - "vendor_available": true, "dependencies": true, "device": true, - "run": true -} + "min-sdk-version": "29", + "run": true, + "vendor-available": true +}
\ No newline at end of file |