Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move trusty dump from gs101 to gs-common

Browse source 
Bug: 244504232
Test: adb bugreport
Change-Id: I486f18dc55eea3843972d856e81d736cd6c25141
This commit is contained in:
Adam Shih 2022-10-04 09:02:17 +08:00
parent 115730d5aa
commit b2d7dc9459
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
device.mk
View file

@ -822,6 +822,9 @@ endif
$(call inherit-product, system/core/trusty/trusty-storage.mk) $(call inherit-product, system/core/trusty/trusty-storage.mk)
$(call inherit-product, system/core/trusty/trusty-base.mk) $(call inherit-product, system/core/trusty/trusty-base.mk)
# Trusty dump
include device/google/gs-common/trusty/trusty.mk
# Trusty unit test tool # Trusty unit test tool
PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl

5
dumpstate/DumpstateDevice.cpp
View file

@ -262,7 +262,6 @@ DumpstateDevice::DumpstateDevice()
{ "aoc", [this](int fd) { dumpAoCSection(fd); } }, { "aoc", [this](int fd) { dumpAoCSection(fd); } },
{ "misc", [this](int fd) { dumpMiscSection(fd); } }, { "misc", [this](int fd) { dumpMiscSection(fd); } },
{ "camera", [this](int fd) { dumpCameraSection(fd); } }, { "camera", [this](int fd) { dumpCameraSection(fd); } },
{ "trusty", [this](int fd) { dumpTrustySection(fd); } },
} { } {
} }
@ -974,10 +973,6 @@ void DumpstateDevice::dumpCameraSection(int fd) {
CommandOptions::WithTimeout(4).Build()); CommandOptions::WithTimeout(4).Build());
} }
void DumpstateDevice::dumpTrustySection(int fd) {
DumpFileToFd(fd, "Trusty TEE0 Logs", "/dev/trusty-log0");
}
static void *dumpModemThread(void *data) { static void *dumpModemThread(void *data) {
std::string modemLogDir = MODEM_LOG_DIRECTORY; std::string modemLogDir = MODEM_LOG_DIRECTORY;
std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY; std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY;

1
dumpstate/DumpstateDevice.h
View file

@ -74,7 +74,6 @@ struct DumpstateDevice : public IDumpstateDevice {
void dumpAoCSection(int fd); void dumpAoCSection(int fd);
void dumpMiscSection(int fd); void dumpMiscSection(int fd);
void dumpCameraSection(int fd); void dumpCameraSection(int fd);
void dumpTrustySection(int fd);
}; };
} // namespace implementation } // namespace implementation