Handle PayloadConfig in Microdroid
Either read the config from JSON or build it from the values in
metadata.
In the latter case, include a hash of the config values in the DICE
config_desc instead of the config path.
Bug: 243513572
Test: atest MicrodroidTests
Change-Id: Ifa1c5dfa17d11a1589621fa265709735d73d4f61
diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 22418b9..563fab0 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -667,7 +667,7 @@
apexes: vec![],
extra_apks: vec![],
prefer_staged: false,
- export_tombstones: payload_config.exportTombstones,
+ export_tombstones: false,
enable_authfs: false,
}
}
diff --git a/virtualizationservice/src/payload.rs b/virtualizationservice/src/payload.rs
index 3efd7ac..82aa760 100644
--- a/virtualizationservice/src/payload.rs
+++ b/virtualizationservice/src/payload.rs
@@ -165,7 +165,6 @@
let payload_metadata = match &app_config.payload {
Payload::PayloadConfig(payload_config) => PayloadMetadata::config(PayloadConfig {
payload_binary_path: payload_config.payloadPath.clone(),
- export_tombstones: payload_config.exportTombstones,
args: payload_config.args.clone().into(),
..Default::default()
}),