diff options
| author | 2023-10-04 00:53:55 +0000 | |
|---|---|---|
| committer | 2023-10-04 00:53:55 +0000 | |
| commit | cc89e85f3aa9225d977d3f78197307ec2f6f47e1 (patch) | |
| tree | 31c3bf3c09634bfef0953e6f0d0fb63b9e66591b | |
| parent | c033dfbb5f7053585bbdbd1b8c3f92c78ae3c94b (diff) | |
| parent | 15f0579ed24f7ffe1b0dbd4ee9f2242fcf910899 (diff) | |
Merge "dumpstate: call printflags instead of reading flag files explicitly" into main am: efed5f1359 am: 9164be59b3 am: fb3beb5efd am: 214dab0334 am: 15f0579ed2
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2766885
Change-Id: I058475ad585c135d167559cf06011a2c6976b3cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 376d57a624..33f6d38cc6 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -187,6 +187,7 @@ void add_mountinfo(); #define CGROUPFS_DIR "/sys/fs/cgroup" #define SDK_EXT_INFO "/apex/com.android.sdkext/bin/derive_sdk" #define DROPBOX_DIR "/data/system/dropbox" +#define PRINT_FLAGS "/system/bin/printflags" // TODO(narayan): Since this information has to be kept in sync // with tombstoned, we should just put it in a common header. @@ -1763,14 +1764,8 @@ Dumpstate::RunStatus Dumpstate::dumpstate() { DumpFile("PRODUCT BUILD-TIME RELEASE FLAGS", "/product/etc/build_flags.json"); DumpFile("VENDOR BUILD-TIME RELEASE FLAGS", "/vendor/etc/build_flags.json"); - DumpFile("SYSTEM BUILD-TIME ACONFIG FLAGS (check dumpstate build_config for runtime values)", - "/system/etc/aconfig_flags.textproto"); - DumpFile("SYSTEM_EXT BUILD-TIME ACONFIG FLAGS (check dumpstate build_config for runtime" - " values)", "/system_ext/etc/aconfig_flags.textproto"); - DumpFile("PRODUCT BUILD-TIME ACONFIG FLAGS (check dumpstate build_config for runtime values)", - "/product/etc/aconfig_flags.textproto"); - DumpFile("VENDOR BUILD-TIME ACONFIG FLAGS (check dumpstate build_config for runtime values)", - "/vendor/etc/aconfig_flags.textproto"); + RunCommand("ACONFIG FLAGS", {PRINT_FLAGS}, + CommandOptions::WithTimeout(10).Always().DropRoot().Build()); RunCommand("STORAGED IO INFO", {"storaged", "-u", "-p"}); |