Merge "Supports ferrochrome for launching HSUM" into main
diff --git a/docs/custom_vm.md b/docs/custom_vm.md
index fce6da2..d99452c 100644
--- a/docs/custom_vm.md
+++ b/docs/custom_vm.md
@@ -252,12 +252,15 @@
```
To see console logs only, check
-`/data/data/com.android.virtualization.vmlauncher/files/console.log`
-Or
-`/data/data/com.google.android.virtualization.vmlauncher/files/console.log`
+`/data/data/com{,.google}.android.virtualization.vmlauncher/files/console.log`
+
+For HSUM enabled devices,
+`/data/user/${current_user_id}/com{,.google}.android.virtualization.vmlauncher/files/console.log`
+
+You can monitor console out as follows
```shell
-$ adb shell su root tail +0 -F /data/data/com{,.google}.android.virtualization.vmlauncher/files/console.log
+$ adb shell 'su root tail +0 -F /data/user/$(am get-current-user)/com{,.google}.android.virtualization.vmlauncher/files/console.log'
```
For ChromiumOS, you can ssh-in. Use following commands after network setup.
diff --git a/tests/ferrochrome/ferrochrome.sh b/tests/ferrochrome/ferrochrome.sh
index d72e882..6814ac5 100755
--- a/tests/ferrochrome/ferrochrome.sh
+++ b/tests/ferrochrome/ferrochrome.sh
@@ -135,7 +135,12 @@
echo "Starting ferrochrome"
adb shell am start-activity -a ${ACTION_NAME} > /dev/null
-log_path="/data/data/${pkg_name}/files/console.log"
+if [[ $(adb shell getprop ro.fw.mu.headless_system_user) == "true" ]]; then
+ current_user=$(adb shell am get-current-user)
+ log_path="/data/user/${current_user}/${pkg_name}/files/console.log"
+else
+ log_path="/data/data/${pkg_name}/files/console.log"
+fi
fecr_start_time=${EPOCHSECONDS}
while [[ $((EPOCHSECONDS - fecr_start_time)) -lt ${FECR_BOOT_TIMEOUT} ]]; do