diff --git a/device.mk b/device.mk index 9405815b..4fe03e98 100644 --- a/device.mk +++ b/device.mk @@ -805,6 +805,9 @@ endif $(call inherit-product, system/core/trusty/trusty-storage.mk) $(call inherit-product, system/core/trusty/trusty-base.mk) +# Trusty dump +include device/google/gs-common/trusty/trusty.mk + # Trusty unit test tool PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \ tipc-test diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index feb3ca18..6d0fffbd 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -235,7 +235,6 @@ Dumpstate::Dumpstate() { "aoc", [this](int fd) { dumpAoCSection(fd); } }, { "ramdump", [this](int fd) { dumpRamdumpSection(fd); } }, { "misc", [this](int fd) { dumpMiscSection(fd); } }, - { "trusty", [this](int fd) { dumpTrustySection(fd); } }, { "led", [this](int fd) { dumpLEDSection(fd); } }, }, mLogSections{ @@ -1076,10 +1075,6 @@ void Dumpstate::dumpMiscSection(int fd) { DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task"); } -void Dumpstate::dumpTrustySection(int fd) { - RunCommandToFd(fd, "Trusty TEE0 Logs", {"/vendor/bin/sh", "-c", "cat /dev/trusty-log0"}, CommandOptions::WithTimeout(1).Build()); -} - // Dump items related to LED void Dumpstate::dumpLEDSection(int fd) { struct stat buffer; diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h index d23d0537..9d606756 100644 --- a/dumpstate/Dumpstate.h +++ b/dumpstate/Dumpstate.h @@ -66,7 +66,6 @@ class Dumpstate : public BnDumpstateDevice { void dumpAoCSection(int fd); void dumpRamdumpSection(int fd); void dumpMiscSection(int fd); - void dumpTrustySection(int fd); void dumpLEDSection(int fd); void dumpLogSection(int fd, int fdModem);