Snap for 8730993 from 69de2932d96a41066ab7a4c281255abcfe756703 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: I4ef91bdda6354980d14e66e66a5ee18c450d1f5a

3 files changed, 10 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 28b8053..73e0c70 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo2android.py --device --run --dependencies.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -39,11 +39,8 @@ license {
 
 rust_library {
     name: "libhashbrown",
-    // has rustc warnings
     host_supported: true,
     crate_name: "hashbrown",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.11.2",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -55,3 +52,11 @@ rust_library {
         "libahash",
     ],
 }
+
+// dependent_library ["feature_list"]
+//   ahash-0.7.2 "folded_multiply,runtime-rng,specialize"
+//   cfg-if-1.0.0
+//   getrandom-0.2.2
+//   libc-0.2.92 "default,std"
+//   once_cell-1.7.2 "alloc,race,unstable"
+//   version_check-0.9.3
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 91f37bf..e707449 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,15 +5,7 @@
       "name": "keystore2_test"
     },
     {
-      "name": "legacykeystore_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
+      "name": "vpnprofilestore_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "device": true,
-  "run": true
-}
\ No newline at end of file