Snap for 8989391 from 5170d868c9 to udc-release

Change-Id: I77fb7449a36e8f4ed75b14fa38432a5b86fdf5c4
This commit is contained in:
Android Build Coastguard Worker 2022-08-25 01:03:03 +00:00
commit 33c266229c
4 changed files with 7 additions and 7 deletions

View file

@ -571,6 +571,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
# Titan-M # Titan-M
ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
include hardware/google/pixel/dauntless/dauntless.mk include hardware/google/pixel/dauntless/dauntless.mk
include device/google/gs-common/dauntless/gsc.mk
endif endif
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \

View file

@ -238,7 +238,7 @@ Dumpstate::Dumpstate()
{ "aoc", [this](int fd) { dumpAoCSection(fd); } }, { "aoc", [this](int fd) { dumpAoCSection(fd); } },
{ "ramdump", [this](int fd) { dumpRamdumpSection(fd); } }, { "ramdump", [this](int fd) { dumpRamdumpSection(fd); } },
{ "misc", [this](int fd) { dumpMiscSection(fd); } }, { "misc", [this](int fd) { dumpMiscSection(fd); } },
{ "gsc", [this](int fd) { dumpGscSection(fd); } }, { "dump", [this](int fd) { dumpSection(fd); } },
{ "trusty", [this](int fd) { dumpTrustySection(fd); } }, { "trusty", [this](int fd) { dumpTrustySection(fd); } },
}, },
mLogSections{ mLogSections{
@ -1118,11 +1118,9 @@ void Dumpstate::dumpMiscSection(int fd) {
DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task"); DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task");
} }
// Dump items related to GSC // Dump scripts under vendor/bin/dump
void Dumpstate::dumpGscSection(int fd) { void Dumpstate::dumpSection(int fd) {
RunCommandToFd(fd, "Citadel VERSION", {"vendor/bin/hw/citadel_updater", "-lv"}); RunCommandToFd(fd, "dump", {"/vendor/bin/dump/dump_gsc.sh"});
RunCommandToFd(fd, "Citadel STATS", {"vendor/bin/hw/citadel_updater", "--stats"});
RunCommandToFd(fd, "GSC DEBUG DUMP", {"vendor/bin/hw/citadel_updater", "-D"});
} }
void Dumpstate::dumpTrustySection(int fd) { void Dumpstate::dumpTrustySection(int fd) {

View file

@ -67,7 +67,7 @@ class Dumpstate : public BnDumpstateDevice {
void dumpAoCSection(int fd); void dumpAoCSection(int fd);
void dumpRamdumpSection(int fd); void dumpRamdumpSection(int fd);
void dumpMiscSection(int fd); void dumpMiscSection(int fd);
void dumpGscSection(int fd); void dumpSection(int fd);
void dumpTrustySection(int fd); void dumpTrustySection(int fd);
void dumpLogSection(int fd, int fdModem); void dumpLogSection(int fd, int fdModem);

View file

@ -57,6 +57,7 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
UFS_ERR_PATH(auto_hibern8_err_count) UFS_ERR_PATH(auto_hibern8_err_count)
}, },
.BlockStatsLength = BLOCK_STATS_LENGTH, .BlockStatsLength = BLOCK_STATS_LENGTH,
.AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once",
}; };
const struct UeventListener::UeventPaths ueventPaths = { const struct UeventListener::UeventPaths ueventPaths = {