summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Devin Moore <devinmoore@google.com> 2022-09-29 22:54:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-29 22:54:49 +0000
commit5b549c826c0faf26d7f9bae5d24686490a84819d (patch)
treeba35faf1431ae22bbec02d47afee72f6d8e2d636
parent682bb4a7b943fc483b7365b3c017d7683fe6333a (diff)
parent15775ed47c61fd931cbf6ed71115033cf51db8cd (diff)
Merge "Get the current hardware sku for the vintf files" am: 90d6f65f55 am: e82f0946ca am: d47011e6a1 am: 15775ed47c
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2227898 Change-Id: I722aba2e9673f6d937facf13f495b0bda7a3405a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--cmds/dumpstate/dumpstate.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 6f8654ed24..6e9747f4dd 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1405,7 +1405,9 @@ static void DumpHals(int out_fd = STDOUT_FILENO) {
// Dump all of the files that make up the vendor interface.
// See the files listed in dumpFileList() for the latest list of files.
static void DumpVintf() {
- const auto vintfFiles = android::vintf::details::dumpFileList();
+
+ const std::string sku = android::base::GetProperty("ro.boot.product.hardware.sku", "");
+ const auto vintfFiles = android::vintf::details::dumpFileList(sku);
for (const auto vintfFile : vintfFiles) {
struct stat st;
if (stat(vintfFile.c_str(), &st) == 0) {