Snap for 10447354 from dc2acc78c459fabb53f2a8b896e5f11fe1810ca3 to mainline-cellbroadcast-release
Change-Id: Ic76414c825ca33c7962ef732fb75bb628bf4fcb4
diff --git a/Android.bp b/Android.bp
index 514fc87..e7f5dbe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,6 +42,7 @@
features: [
"clock",
"libc",
+ "serde",
"std",
"winapi",
],
@@ -49,9 +50,12 @@
"liblibc",
"libnum_integer",
"libnum_traits",
+ "libserde",
],
apex_available: [
"//apex_available:platform",
"com.android.virt",
],
+ product_available: true,
+ vendor_available: true,
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2ae3abf..bc71296 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,31 +1,14 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
- "presubmit": [
+ "imports": [
{
- "name": "libapkverify.integration_test"
+ "path": "packages/modules/Virtualization/authfs"
},
{
- "name": "libapkverify.test"
+ "path": "packages/modules/Virtualization/virtualizationmanager"
},
{
- "name": "libcert_request_validator_tests"
- },
- {
- "name": "microdroid_manager_test"
- }
- ],
- "presubmit-rust": [
- {
- "name": "libapkverify.integration_test"
- },
- {
- "name": "libapkverify.test"
- },
- {
- "name": "libcert_request_validator_tests"
- },
- {
- "name": "microdroid_manager_test"
+ "path": "packages/modules/Virtualization/zipfuse"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 90c5a67..cd14e87 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -4,6 +4,6 @@
"com.android.virt"
],
"device": true,
- "features": "std,clock",
+ "features": "std,clock,serde",
"run": true
}