Snap for 8564071 from 126311f7da7d940f242fc847b474838608ee992a to mainline-sdkext-release
Change-Id: I73d8a52314ef756fb02b7884b00417eed34cc1c5
diff --git a/Android.bp b/Android.bp
index 228cf04..488af76 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,6 +36,8 @@
// 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: [
@@ -44,10 +46,7 @@
],
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 a60a6e8..07d379e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,17 +1,66 @@
// 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": "vpnprofilestore_test"
+ "name": "keystore2_vintf_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "legacykeystore_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "apkdmverity.test"
},
{
"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 b933b33..a78ac00 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,7 @@
{
"apex-available": [
"//apex_available:platform",
+ "com.android.compos",
"com.android.virt"
],
"dependencies": true,
