commit ccd69816b168899d0338e7e3f8c88559e3199386
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 29 09:34:40 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 29 09:34:40 2023 +0000
tree cc6b9065aee4b1f5567ba3e4e98ab5ba177544e3
parent 577d00758fbf24be1c85294df73c0fded3d5aac1
parent e0bc17400e82ae999e6177f90448455124352e10

Merge "Android.bp: Remove apex_avaiable from guest libs"

libs/avb/Android.bp

diff --git a/libs/avb/Android.bp b/libs/avb/Android.bp
index 3a671e2..a2d9e1a 100644
--- a/libs/avb/Android.bp
+++ b/libs/avb/Android.bp
@@ -10,7 +10,6 @@
     visibility: ["//packages/modules/Virtualization:__subpackages__"],
     source_stem: "bindings",
     bindgen_flags: [
-        "--size_t-is-usize",
         "--constified-enum-module AvbDescriptorTag",
         "--default-enum-style rust",
         "--allowlist-type=AvbDescriptorTag",

libs/libfdt/Android.bp

diff --git a/libs/libfdt/Android.bp b/libs/libfdt/Android.bp
index 2a6e75f..0540f26 100644
--- a/libs/libfdt/Android.bp
+++ b/libs/libfdt/Android.bp
@@ -8,7 +8,6 @@
     wrapper_src: "bindgen/fdt.h",
     source_stem: "bindings",
     bindgen_flags: [
-        "--size_t-is-usize",
         "--allowlist-type=fdt_.*",
         "--allowlist-function=fdt_.*",
         "--allowlist-var=FDT_.*",

vm/src/run.rs

diff --git a/vm/src/run.rs b/vm/src/run.rs
index 663fa25..392fa1c 100644
--- a/vm/src/run.rs
+++ b/vm/src/run.rs
@@ -315,8 +315,13 @@
         .context("Failed to create VM")?;
     vm.start().context("Failed to start VM")?;
 
+    let debug_level = match config {
+        VirtualMachineConfig::AppConfig(config) => config.debugLevel,
+        _ => DebugLevel::NONE,
+    };
     println!(
-        "Created VM from {} with CID {}, state is {}.",
+        "Created {} from {} with CID {}, state is {}.",
+        if debug_level == DebugLevel::FULL { "debuggable VM" } else { "VM" },
         payload_config,
         vm.cid(),
         state_to_str(vm.state()?)