Snap for 8730993 from 3878291c4d6ebd5873645ab7d578f1228fdaba08 to mainline-tzdata3-release
Change-Id: I736f0285ddcb832d97d3c8ca0c0c7305043f0c45
diff --git a/Android.bp b/Android.bp
index 488af76..228cf04 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,8 +36,6 @@
// has rustc warnings
host_supported: true,
crate_name: "clap",
- cargo_env_compat: true,
- cargo_pkg_version: "2.33.3",
srcs: ["src/lib.rs"],
edition: "2015",
rustlibs: [
@@ -46,7 +44,10 @@
],
apex_available: [
"//apex_available:platform",
- "com.android.compos",
"com.android.virt",
],
}
+
+// dependent_library ["feature_list"]
+// bitflags-1.2.1 "default"
+// textwrap-0.13.4
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 07d379e..a60a6e8 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,66 +1,17 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
- "imports": [
- {
- "path": "external/rust/crates/base64"
- },
- {
- "path": "external/rust/crates/libsqlite3-sys"
- },
- {
- "path": "external/rust/crates/tinytemplate"
- },
- {
- "path": "external/rust/crates/tinyvec"
- },
- {
- "path": "external/rust/crates/unicode-xid"
- }
- ],
"presubmit": [
{
- "name": "ZipFuseTest"
- },
- {
- "name": "apkdmverity.test"
- },
- {
- "name": "authfs_device_test_src_lib"
- },
- {
- "name": "diced_test"
- },
- {
"name": "keystore2_test"
},
{
- "name": "keystore2_vintf_test"
+ "name": "vpnprofilestore_test"
},
{
- "name": "legacykeystore_test"
- }
- ],
- "presubmit-rust": [
- {
- "name": "ZipFuseTest"
- },
- {
- "name": "apkdmverity.test"
+ "name": "libsqlite3-sys_device_test_src_lib"
},
{
"name": "authfs_device_test_src_lib"
- },
- {
- "name": "diced_test"
- },
- {
- "name": "keystore2_test"
- },
- {
- "name": "keystore2_vintf_test"
- },
- {
- "name": "legacykeystore_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index a78ac00..b933b33 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,6 @@
{
"apex-available": [
"//apex_available:platform",
- "com.android.compos",
"com.android.virt"
],
"dependencies": true,
