commit 86f566324ef0d86cb5a40fce4861fcd5980cab83
author Jakob Vukalović <jakobvukalovic@google.com> Thu Jul 20 09:03:41 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 20 09:03:41 2023 +0000
tree 695381c3c954bb940bf9469aa4e52753137ba5db
parent 5886dc6db7198cb2f20cf9e6b1687750f4074fc7
parent 70ba63302d0865bdbc4e48adf36412e79f6f8827

Merge "apex: Add prepare_device_vfio script" into main

authfs/src/fusefs.rs

diff --git a/authfs/src/fusefs.rs b/authfs/src/fusefs.rs
index 87bdffc..bddf2c3 100644
--- a/authfs/src/fusefs.rs
+++ b/authfs/src/fusefs.rs
@@ -386,7 +386,8 @@
 }
 
 cfg_if::cfg_if! {
-    if #[cfg(all(target_arch = "aarch64", target_pointer_width = "64"))] {
+    if #[cfg(all(any(target_arch = "aarch64", target_arch = "riscv64"),
+                 target_pointer_width = "64"))] {
         fn blk_size() -> libc::c_int { CHUNK_SIZE as libc::c_int }
     } else {
         fn blk_size() -> libc::c_long { CHUNK_SIZE as libc::c_long }

microdroid/kdump/Android.bp

diff --git a/microdroid/kdump/Android.bp b/microdroid/kdump/Android.bp
index cc681a7..b9a18fe 100644
--- a/microdroid/kdump/Android.bp
+++ b/microdroid/kdump/Android.bp
@@ -18,6 +18,9 @@
     static_executable: true,
     installable: false,
     compile_multilib: "64",
+    sanitize: {
+        hwaddress: false, // HWASAN setup fails when run as init process
+    },
 }
 
 android_filesystem {