Add rust_test and update TEST_MAPPING am: ba7afd98e9 am: b744269b45 am: 8340d7c2ae
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/env_logger/+/1365659
Change-Id: I95e7b0dfe16ed7afc67af2236c0c694d5cfd2ebd
diff --git a/Android.bp b/Android.bp
index cffdee5..473608f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,55 @@
-// This file is generated by cargo2android.py --run --dependencies --device --features= --no-host.
+// This file is generated by cargo2android.py --run --dependencies --device --features= --no-host --tests.
+
+rust_test {
+ name: "env_logger_device_test_src_lib",
+ crate_name: "env_logger",
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+ rustlibs: [
+ "liblog_rust",
+ ],
+}
+
+rust_defaults {
+ name: "env_logger_defaults",
+ crate_name: "env_logger",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+ flags: [
+ "--cfg test",
+ ],
+ rustlibs: [
+ "libenv_logger",
+ "liblog_rust",
+ ],
+}
+
+rust_test {
+ name: "env_logger_device_test_tests_init-twice-retains-filter",
+ defaults: ["env_logger_defaults"],
+ srcs: ["tests/init-twice-retains-filter.rs"],
+}
+
+rust_test {
+ name: "env_logger_device_test_tests_log-in-log",
+ defaults: ["env_logger_defaults"],
+ srcs: ["tests/log-in-log.rs"],
+}
+
+rust_test {
+ name: "env_logger_device_test_tests_log_tls_dtors",
+ defaults: ["env_logger_defaults"],
+ srcs: ["tests/log_tls_dtors.rs"],
+}
+
+rust_test {
+ name: "env_logger_device_test_tests_regexp_filter",
+ defaults: ["env_logger_defaults"],
+ srcs: ["tests/regexp_filter.rs"],
+}
rust_library {
name: "libenv_logger",
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..862e8e2
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,20 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+ "presubmit": [
+ {
+ "name": "env_logger_device_test_src_lib"
+ },
+ {
+ "name": "env_logger_device_test_tests_init-twice-retains-filter"
+ },
+ {
+ "name": "env_logger_device_test_tests_log-in-log"
+ },
+ {
+ "name": "env_logger_device_test_tests_log_tls_dtors"
+ },
+ {
+ "name": "env_logger_device_test_tests_regexp_filter"
+ }
+ ]
+}
