commit 4e198eefea872be21b9c87c5251e6b1c09b0e64c
author Devin Moore <devinmoore@google.com> Wed Mar 22 17:04:47 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 22 17:04:47 2023 +0000
tree 46d24baade1b4617f7b10dc83cab5edd3356df12
parent 56df2453e7bbe7ac592c2e04754a9e095a6163e6
parent adbac998315f387d38ec4564a7c35b551ea90a08

Merge "Dump /proc/bootconfig in dumpstate" am: adbac99831

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2499398

Change-Id: If6aecc11d8f9fcf7c51361874ba030373f187eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 4fb08c5..d5b1b98 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -814,6 +814,8 @@
     printf("Kernel: ");
     DumpFileToFd(STDOUT_FILENO, "", "/proc/version");
     printf("Command line: %s\n", strtok(cmdline_buf, "\n"));
+    printf("Bootconfig: ");
+    DumpFileToFd(STDOUT_FILENO, "", "/proc/bootconfig");
     printf("Uptime: ");
     RunCommandToFd(STDOUT_FILENO, "", {"uptime", "-p"},
                    CommandOptions::WithTimeout(1).Always().Build());