diff --git a/device.mk b/device.mk index 4fe03e98..6a5931a8 100644 --- a/device.mk +++ b/device.mk @@ -16,6 +16,7 @@ include device/google/gs-common/device.mk include device/google/gs-common/gs_watchdogd/watchdog.mk +include device/google/gs-common/ramdump/ramdump.mk TARGET_BOARD_PLATFORM := gs201 diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 6d0fffbd..177ff098 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -233,7 +233,6 @@ Dumpstate::Dumpstate() { "display", [this](int fd) { dumpDisplaySection(fd); } }, { "sensors-usf", [this](int fd) { dumpSensorsUSFSection(fd); } }, { "aoc", [this](int fd) { dumpAoCSection(fd); } }, - { "ramdump", [this](int fd) { dumpRamdumpSection(fd); } }, { "misc", [this](int fd) { dumpMiscSection(fd); } }, { "led", [this](int fd) { dumpLEDSection(fd); } }, }, @@ -1036,39 +1035,6 @@ void Dumpstate::dumpSensorsUSFSection(int fd) { } } -// Gzip binary data and dump to fd in base64 format. Cmd to decode is also attached. -void dumpGzippedFileInBase64ToFd(int fd, const char* title, const char* file_path) { - auto cmd = ::android::base::StringPrintf("echo 'base64 -d <i, header->size, std::string(header->buf, header->i).c_str()), fd); - } else { - ::android::base::WriteStringToFd("*** Ramdump misc file: abl.log: File not found\n", fd); - } - dumpGzippedFileInBase64ToFd( - fd, "Ramdump misc file: acpm.lst (gzipped in base64)", "/mnt/vendor/ramdump/acpm.lst"); - dumpGzippedFileInBase64ToFd( - fd, "Ramdump misc file: s2d.lst (gzipped in base64)", "/mnt/vendor/ramdump/s2d.lst"); -} - // Dump items that don't fit well into any other section void Dumpstate::dumpMiscSection(int fd) { RunCommandToFd(fd, "VENDOR PROPERTIES", {"/vendor/bin/getprop"}); diff --git a/dumpstate/Dumpstate.h b/dumpstate/Dumpstate.h index 9d606756..a92ad98a 100644 --- a/dumpstate/Dumpstate.h +++ b/dumpstate/Dumpstate.h @@ -64,7 +64,6 @@ class Dumpstate : public BnDumpstateDevice { void dumpDisplaySection(int fd); void dumpSensorsUSFSection(int fd); void dumpAoCSection(int fd); - void dumpRamdumpSection(int fd); void dumpMiscSection(int fd); void dumpLEDSection(int fd);