Snap for 8730993 from bbbb33e6009b519e65da19804d45742f2a5131e9 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: I96b8700a6f3ccd31ee7d37b081d8b811410435d8

3 files changed, 19 insertions, 162 deletions

diff --git a/Android.bp b/Android.bp
index e96d563..6b91766 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,8 +43,6 @@ rust_library {
     // has rustc warnings
     host_supported: true,
     crate_name: "log",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.4.14",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: ["std"],
@@ -59,6 +57,8 @@ rust_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    vendor_available: true,
     min_sdk_version: "29",
 }
+
+// dependent_library ["feature_list"]
+//   cfg-if-1.0.0
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 244ce47..1b7b681 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,198 +1,56 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "imports": [
-    {
-      "path": "external/rust/crates/android_logger"
-    },
-    {
-      "path": "external/rust/crates/cast"
-    },
-    {
-      "path": "external/rust/crates/crc32fast"
-    },
-    {
-      "path": "external/rust/crates/env_logger"
-    },
-    {
-      "path": "external/rust/crates/futures-util"
-    },
-    {
-      "path": "external/rust/crates/gdbstub_arch"
-    },
-    {
-      "path": "external/rust/crates/jni"
-    },
-    {
-      "path": "external/rust/crates/libsqlite3-sys"
-    },
-    {
-      "path": "external/rust/crates/mio"
-    },
-    {
-      "path": "external/rust/crates/quiche"
-    },
-    {
-      "path": "external/rust/crates/quickcheck"
-    },
-    {
-      "path": "external/rust/crates/regex"
-    },
-    {
-      "path": "external/rust/crates/serde-xml-rs"
-    },
-    {
-      "path": "external/rust/crates/tokio"
-    },
-    {
-      "path": "external/rust/crates/tokio-test"
-    }
-  ],
   "presubmit": [
     {
-      "name": "ZipFuseTest"
-    },
-    {
-      "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": "doh_unit_test"
-    },
-    {
-      "name": "keystore2_crypto_test_rust"
+      "name": "env_logger_device_test_tests_regexp_filter"
     },
     {
-      "name": "keystore2_selinux_concurrency_test"
+      "name": "env_logger_device_test_tests_log-in-log"
     },
     {
-      "name": "keystore2_selinux_test"
+      "name": "tokio-test_device_test_tests_macros"
     },
     {
       "name": "keystore2_test"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "name": "vpnprofilestore_test"
     },
     {
-      "name": "legacykeystore_test"
+      "name": "tokio-test_device_test_src_lib"
     },
     {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.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": "microdroid_manager_test"
-    },
-    {
-      "name": "rustBinderTest"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "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": "doh_unit_test"
-    },
-    {
-      "name": "keystore2_crypto_test_rust"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
+      "name": "libsqlite3-sys_device_test_src_lib"
     },
     {
       "name": "keystore2_selinux_test"
     },
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_test_utils_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libapkverify.integration_test"
+      "name": "android_logger_device_test_src_lib"
     },
     {
-      "name": "libapkverify.test"
+      "name": "env_logger_device_test_tests_log_tls_dtors"
     },
     {
-      "name": "logger_device_unit_tests"
+      "name": "tokio-test_device_test_tests_block_on"
     },
     {
-      "name": "logger_test_config_log_level"
+      "name": "futures-util_device_test_src_lib"
     },
     {
-      "name": "logger_test_default_init"
+      "name": "tokio-test_device_test_tests_io"
     },
     {
-      "name": "logger_test_env_log_level"
-    },
-    {
-      "name": "logger_test_multiple_init"
+      "name": "keystore2_crypto_test_rust"
     },
     {
-      "name": "microdroid_manager_test"
+      "name": "env_logger_device_test_src_lib"
     },
     {
-      "name": "rustBinderTest"
+      "name": "quiche_device_test_src_lib"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "env_logger_device_test_tests_init-twice-retains-filter"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 11f62b6..723587f 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,6 +7,5 @@
   "device": true,
   "features": "std",
   "min-sdk-version": "29",
-  "run": true,
-  "vendor-available": true
+  "run": true
 }
\ No newline at end of file