use gxp dump in gs-common am: 1b92506c4d

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22175402

Change-Id: Ia0ebaa33c0e91ee74b198d02b096eaaf260027e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Adam Shih 2023-03-21 05:56:49 +00:00 committed by Automerger Merge Worker
commit c3176df694
3 changed files with 1 additions and 18 deletions

View file

@ -26,6 +26,7 @@ include device/google/gs-common/pixel_metrics/pixel_metrics.mk
include device/google/gs-common/performance/perf.mk
include device/google/gs-common/display/dump.mk
include device/google/gs-common/camera/dump.mk
include device/google/gs-common/gxp/dump.mk
include device/google/gs-common/umfw_stat/umfw_stat.mk
TARGET_BOARD_PLATFORM := gs201

View file

@ -199,7 +199,6 @@ Dumpstate::Dumpstate()
mLogSections{
{ "radio", [this](int fd, const std::string &destDir) { dumpRadioLogs(fd, destDir); } },
{ "gps", [this](int fd, const std::string &destDir) { dumpGpsLogs(fd, destDir); } },
{ "gxp", [this](int fd, const std::string &destDir) { dumpGxpLogs(fd, destDir); } },
} {
}
@ -502,22 +501,6 @@ void Dumpstate::dumpGpsLogs(int fd, const std::string &destDir) {
dumpLogs(fd, gpsLogDir, gpsDestDir, maxFileNum, GPS_LOG_PREFIX);
}
void Dumpstate::dumpGxpLogs(int fd, const std::string &destDir) {
bool gxpDumpEnabled = ::android::base::GetBoolProperty("vendor.gxp.attach_to_bugreport", false);
if (gxpDumpEnabled) {
const int maxGxpDebugDumps = 8;
const std::string gxpCoredumpOutputDir = destDir + "/gxp_ssrdump";
const std::string gxpCoredumpInputDir = "/data/vendor/ssrdump";
RunCommandToFd(fd, "MKDIR GXP COREDUMP", {"/vendor/bin/mkdir", "-p", gxpCoredumpOutputDir}, CommandOptions::WithTimeout(2).Build());
// Copy GXP coredumps and crashinfo to the output directory.
dumpLogs(fd, gxpCoredumpInputDir + "/coredump", gxpCoredumpOutputDir, maxGxpDebugDumps, "coredump_gxp_platform");
dumpLogs(fd, gxpCoredumpInputDir, gxpCoredumpOutputDir, maxGxpDebugDumps, "crashinfo_gxp_platform");
}
}
void Dumpstate::dumpLogSection(int fd, int fd_bin)
{
std::string logDir = MODEM_LOG_DIRECTORY;

View file

@ -61,7 +61,6 @@ class Dumpstate : public BnDumpstateDevice {
// Log sections to be dumped individually into dumpstate_board.bin
void dumpRadioLogs(int fd, const std::string &destDir);
void dumpGpsLogs(int fd, const std::string &destDir);
void dumpGxpLogs(int fd, const std::string &destDir);
// Hybrid and binary sections that require an additional file descriptor
void dumpRilLogs(int fd, std::string destDir);