Merge "Changes for the Rust 1.59.0 update"
diff --git a/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb b/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
index 445f731..7973ed6 100644
--- a/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
+++ b/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "8191635"
+ build_id: "8231605"
target: "u-boot_pvmfw"
source_file: "pvmfw.img"
}
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index b659b73..e782bd2 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -250,7 +250,8 @@
RunCommand(args, cmd)
# libavb expects to be able to read the maximum vbmeta size, so we must provide a partition
# which matches this or the read will fail.
- RunCommand(args, ['truncate', '-s', '65536', vbmeta_img])
+ with open(vbmeta_img, 'a') as f:
+ f.truncate(65536)
class TempDirectory(object):
diff --git a/pvmfw/pvmfw.img b/pvmfw/pvmfw.img
index 5e99b5f..d7e64c0 100644
--- a/pvmfw/pvmfw.img
+++ b/pvmfw/pvmfw.img
Binary files differ
diff --git a/virtualizationservice/src/main.rs b/virtualizationservice/src/main.rs
index 43e46a3..7bfb531 100644
--- a/virtualizationservice/src/main.rs
+++ b/virtualizationservice/src/main.rs
@@ -40,7 +40,10 @@
fn main() {
android_logger::init_once(
- android_logger::Config::default().with_tag(LOG_TAG).with_min_level(Level::Info),
+ android_logger::Config::default()
+ .with_tag(LOG_TAG)
+ .with_min_level(Level::Info)
+ .with_log_id(android_logger::LogId::System),
);
clear_temporary_files().expect("Failed to delete old temporary files");