Snap for 8570526 from 0a3a722be1b014e08b8742f19a1fe70d6b76e387 to mainline-scheduling-release
Change-Id: Ie9e57be5f4ec4515c289e1abac50049c5683cdf0
diff --git a/Android.bp b/Android.bp
index ce06234..7feffa5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features=serde,std,v1.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -42,17 +42,23 @@
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: [
+ "getrandom",
"serde",
"std",
"v1",
+ "v4",
],
rustlibs: [
+ "libgetrandom",
"libserde",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
-
-// dependent_library ["feature_list"]
-// serde-1.0.124 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..4756a6c
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,25 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+ "presubmit": [
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ]
+}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..21b1d6c
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "features": "serde,std,v1,v4",
+ "run": true
+}
\ No newline at end of file
