commit 56e2db3e5cfd5ef3140c2498ac3fe5b555cf5fbd
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 02 09:49:52 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 02 09:49:52 2022 +0000
tree 6f4232a7c12f606831426b4da5f00c64a30b1e77
parent 784741cfb65191db74414e1ef59d762fa40131dc
parent dfd948cfca61e8ef46287b61e36f700eb5b200b5

Merge "Use apexes on device APEX for testing"

.gitignore

diff --git a/.gitignore b/.gitignore
index 96ef6c0..5917dfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
-/target
+apkdmverity/target/
+zipfuse/target/
+policy
+zipfuse/target/
 Cargo.lock

libs/avb_bindgen/Android.bp

diff --git a/libs/avb_bindgen/Android.bp b/libs/avb_bindgen/Android.bp
index 1e62864..6dc16e8 100644
--- a/libs/avb_bindgen/Android.bp
+++ b/libs/avb_bindgen/Android.bp
@@ -7,6 +7,7 @@
     host_supported: true,
     wrapper_src: "bindgen/avb.h",
     crate_name: "avb_bindgen",
+    visibility: ["//packages/modules/Virtualization:__subpackages__"],
     source_stem: "bindings",
     bindgen_flags: [
         "--size_t-is-usize",

microdroid_manager/src/main.rs

diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index dce6c9d..fa064a7 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -179,7 +179,6 @@
             Ok(())
         }
         Err(err) => {
-            error!("task terminated: {:?}", err);
             let (error_code, message) = translate_error(&err);
             service.notifyError(error_code, &message)?;
             Err(err)