Merge 45cc3d34a6cf8c4d480478442d79f0523a443062 on remote branch
Change-Id: I54add0e6d39c211841ac870ab4e66334cd0a99fb
diff --git a/Android.bp b/Android.bp
index aafe9e0..7feffa5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,6 +42,8 @@
name: "libuuid",
host_supported: true,
crate_name: "uuid",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.8.2",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -60,9 +62,3 @@
"com.android.virt",
],
}
-
-// dependent_library ["feature_list"]
-// cfg-if-1.0.0
-// getrandom-0.2.3
-// libc-0.2.97
-// serde-1.0.126 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 59ed96b..4756a6c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,6 +5,20 @@
"name": "apkdmverity.test"
},
{
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
"name": "virtualizationservice_device_test"
}
]