aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 16:43:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 16:43:51 +0000
commit3f692feddaa2f4450e87bf3fe3ddb2ac0e4c15d0 (patch)
tree7569440475603d4e38e2f550b90803081226481b
parentdd7deac4d676d29daf106d7732e04f8a56592180 (diff)
parent4541755b559c0926e02c8eca7045d92d3ef4c1bb (diff)
downloadsmallvec-3f692feddaa2f4450e87bf3fe3ddb2ac0e4c15d0.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 44b1240f83 am: 4541755b55
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1912852 Change-Id: Ib61c06a3eed981beeeb1ecc5e24c51c9b7f365c9
-rw-r--r--Android.bp2
-rw-r--r--TEST_MAPPING24
2 files changed, 25 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 7a42765..4c2cc08 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@ rust_library {
name: "libsmallvec",
host_supported: true,
crate_name: "smallvec",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.6.1",
srcs: ["src/lib.rs"],
edition: "2018",
apex_available: [
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2fb101e..713deb2 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,13 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/parking_lot_core"
+ },
+ {
+ "path": "external/rust/crates/vulkano"
+ }
+ ],
"presubmit": [
{
"name": "ZipFuseTest"
@@ -14,7 +22,21 @@
"name": "legacykeystore_test"
},
{
- "name": "parking_lot_core_device_test_src_lib"
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "legacykeystore_test"
},
{
"name": "virtualizationservice_device_test"