Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 843f78b5a2 am: 81e25ffda4 am: ad93a4a4b2

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/env_logger/+/1912674

Change-Id: Icbc350a4db9d8a732fc2c36ce59308f561254187

3 files changed, 105 insertions, 70 deletions

diff --git a/Android.bp b/Android.bp
index 97eb8c5..cb89620 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,35 +37,26 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "env_logger_test_defaults",
+rust_test {
+    name: "env_logger_test_src_lib",
+    host_supported: true,
     crate_name: "env_logger",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "0.9.0",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "liblog_rust",
     ],
 }
 
-rust_test_host {
-    name: "env_logger_host_test_src_lib",
-    defaults: ["env_logger_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "env_logger_device_test_src_lib",
-    defaults: ["env_logger_test_defaults"],
-}
-
 rust_defaults {
-    name: "env_logger_test_defaults_env_logger",
+    name: "env_logger_test_defaults",
     crate_name: "env_logger",
     cargo_env_compat: true,
     cargo_pkg_version: "0.9.0",
@@ -79,9 +70,10 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "env_logger_host_test_tests_init-twice-retains-filter",
-    defaults: ["env_logger_test_defaults_env_logger"],
+rust_test {
+    name: "env_logger_test_tests_init-twice-retains-filter",
+    defaults: ["env_logger_test_defaults"],
+    host_supported: true,
     srcs: ["tests/init-twice-retains-filter.rs"],
     test_options: {
         unit_test: true,
@@ -89,14 +81,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "env_logger_device_test_tests_init-twice-retains-filter",
-    defaults: ["env_logger_test_defaults_env_logger"],
-    srcs: ["tests/init-twice-retains-filter.rs"],
-}
-
-rust_test_host {
-    name: "env_logger_host_test_tests_log-in-log",
-    defaults: ["env_logger_test_defaults_env_logger"],
+    name: "env_logger_test_tests_log-in-log",
+    defaults: ["env_logger_test_defaults"],
+    host_supported: true,
     srcs: ["tests/log-in-log.rs"],
     test_options: {
         unit_test: true,
@@ -104,14 +91,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "env_logger_device_test_tests_log-in-log",
-    defaults: ["env_logger_test_defaults_env_logger"],
-    srcs: ["tests/log-in-log.rs"],
-}
-
-rust_test_host {
-    name: "env_logger_host_test_tests_log_tls_dtors",
-    defaults: ["env_logger_test_defaults_env_logger"],
+    name: "env_logger_test_tests_log_tls_dtors",
+    defaults: ["env_logger_test_defaults"],
+    host_supported: true,
     srcs: ["tests/log_tls_dtors.rs"],
     test_options: {
         unit_test: true,
@@ -119,26 +101,15 @@ rust_test_host {
 }
 
 rust_test {
-    name: "env_logger_device_test_tests_log_tls_dtors",
-    defaults: ["env_logger_test_defaults_env_logger"],
-    srcs: ["tests/log_tls_dtors.rs"],
-}
-
-rust_test_host {
-    name: "env_logger_host_test_tests_regexp_filter",
-    defaults: ["env_logger_test_defaults_env_logger"],
+    name: "env_logger_test_tests_regexp_filter",
+    defaults: ["env_logger_test_defaults"],
+    host_supported: true,
     srcs: ["tests/regexp_filter.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
-rust_test {
-    name: "env_logger_device_test_tests_regexp_filter",
-    defaults: ["env_logger_test_defaults_env_logger"],
-    srcs: ["tests/regexp_filter.rs"],
-}
-
 rust_library {
     name: "libenv_logger",
     host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 18638bf..e8284bd 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,38 +1,49 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
+    {
+      "path": "external/rust/crates/android_logger"
+    },
     {
-      "name": "android_logger_device_test_src_lib"
+      "path": "external/rust/crates/cast"
     },
     {
-      "name": "android_logger_device_test_tests_config_log_level"
+      "path": "external/rust/crates/crc32fast"
     },
     {
-      "name": "android_logger_device_test_tests_default_init"
+      "path": "external/rust/crates/libsqlite3-sys"
     },
     {
-      "name": "android_logger_device_test_tests_multiple_init"
+      "path": "external/rust/crates/mio"
     },
     {
+      "path": "external/rust/crates/quickcheck"
+    },
+    {
+      "path": "external/rust/crates/regex"
+    }
+  ],
+  "presubmit": [
+    {
       "name": "authfs_device_test_src_lib"
     },
     {
       "name": "doh_unit_test"
     },
     {
-      "name": "env_logger_device_test_src_lib"
+      "name": "env_logger_test_src_lib"
     },
     {
-      "name": "env_logger_device_test_tests_init-twice-retains-filter"
+      "name": "env_logger_test_tests_init-twice-retains-filter"
     },
     {
-      "name": "env_logger_device_test_tests_log-in-log"
+      "name": "env_logger_test_tests_log-in-log"
     },
     {
-      "name": "env_logger_device_test_tests_log_tls_dtors"
+      "name": "env_logger_test_tests_log_tls_dtors"
     },
     {
-      "name": "env_logger_device_test_tests_regexp_filter"
+      "name": "env_logger_test_tests_regexp_filter"
     },
     {
       "name": "keystore2_selinux_concurrency_test"
@@ -47,27 +58,80 @@
       "name": "legacykeystore_test"
     },
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
+      "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"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "authfs_device_test_src_lib"
+    },
+    {
+      "name": "doh_unit_test"
     },
     {
-      "name": "libsqlite3_bindgen_test"
+      "name": "env_logger_test_src_lib"
     },
     {
-      "name": "logger_device_test_config_log_level"
+      "name": "env_logger_test_tests_init-twice-retains-filter"
     },
     {
-      "name": "logger_device_test_default_init"
+      "name": "env_logger_test_tests_log-in-log"
     },
     {
-      "name": "logger_device_test_env_log_level"
+      "name": "env_logger_test_tests_log_tls_dtors"
     },
     {
-      "name": "logger_device_test_multiple_init"
+      "name": "env_logger_test_tests_regexp_filter"
+    },
+    {
+      "name": "keystore2_selinux_concurrency_test"
+    },
+    {
+      "name": "keystore2_selinux_test"
+    },
+    {
+      "name": "keystore2_test"
+    },
+    {
+      "name": "legacykeystore_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 49580fa..8597ef3 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,11 +6,11 @@
     "com.android.uwb",
     "com.android.virt"
   ],
-  "min_sdk_version": "29",
   "dependencies": true,
-  "vendor_available": true,
   "device": true,
   "features": "",
+  "min-sdk-version": "29",
   "run": true,
-  "tests": true
-}
+  "tests": true,
+  "vendor-available": true
+}
\ No newline at end of file