commit 26113c8502a48545941b665c0b405c20124deacf
author Jakob Vukalović <jakobvukalovic@google.com> Mon May 22 09:29:36 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 22 09:29:36 2023 +0000
tree e451aa50094244946689a1d376e08deb7efbca33
parent 8ba2eb4bb6d45cc91f180f30c5f631280fe15e8b
parent 50559dfbc0e17bb49d7e6ffe4d4fbe1cfa81722f

Merge "vmbase: Explicitly map valid memory ranges"

microdroid/init.rc

diff --git a/microdroid/init.rc b/microdroid/init.rc
index 871db94..42033d6 100644
--- a/microdroid/init.rc
+++ b/microdroid/init.rc
@@ -147,10 +147,11 @@
 
 service ueventd /system/bin/ueventd
     user root
+    group root
     class core
     critical
     seclabel u:r:ueventd:s0
-    capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID MKNOD NET_ADMIN SETGID SETUID SYS_MODULE SYS_RAWIO
+    capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID MKNOD NET_ADMIN SETGID SETUID SYS_MODULE SYS_RAWIO SYS_ADMIN
 
 service console /system/bin/sh
     class core

pvmfw/Android.bp

diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index 0ae2203..c79605f 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -158,7 +158,7 @@
     ],
     out: ["lib.rs"],
     tools: ["dtc"],
-    cmd: "prebuilts/clang/host/linux-x86/clang-r487747/bin/clang " + // UGLY!!!
+    cmd: "prebuilts/clang/host/linux-x86/clang-r487747c/bin/clang " + // UGLY!!!
         "-E -P -x assembler-with-cpp -I external/arm-trusted-firmware/include " +
         "-o $(genDir)/preprocessed.dts $(location platform.dts) && " +
         "$(location dtc) -I dts -O dtb -o $(genDir)/compiled.dtbo $(genDir)/preprocessed.dts && " +