Snap for 6440900 from 1e8f30f919f22aab60b99224a655fb4b10c17b3b to rvc-release (71ba851b) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -159,23 +159,23 @@ cc_defaults {
		"snapshot_test.cpp",
		],
		shared_libs: [
		"android.hardware.boot@1.0",
		"android.hardware.boot@1.1",
		"libbinder",
		"libcrypto",
		"libhidlbase",
		"libprotobuf-cpp-lite",
		"libsparse",
		"libutils",
		"libz",
		],
		static_libs: [
		"android.hardware.boot@1.0",
		"android.hardware.boot@1.1",
		"libfs_mgr",
		"libgsi",
		"libgmock",
		"liblp",
		"libsnapshot",
		"libsnapshot_test_helpers",
		"libsparse",
		],
		header_libs: [
		"libstorage_literals_headers",

+4 −5

Original line number	Diff line number	Diff line
		@@ -100,13 +100,12 @@ cc_test {
		"libjsoncpp",
		"libprotobuf-cpp-full",
		],
		target: {
		android: {
		test_config: "vts_processgroup_validate_test.xml",
		},
		},
		test_suites: [
		"vts",
		],
		}

		vts_config {
		name: "VtsProcessgroupValidateTest",
		test_config: "vts_processgroup_validate_test.xml",
		}

+12 −1

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@
		#include <string>
		#include <unordered_map>
		#include <unordered_set>
		#include <vector>

		#include <android-base/file.h>
		#include <android-base/logging.h>
		@@ -1204,9 +1205,19 @@ milliseconds llkCheck(bool checkRunning) {
		}
		}
		// We are here because we have confirmed kernel live-lock
		std::vector<std::string> threads;
		auto taskdir = procdir + std::to_string(tid) + "/task/";
		dir taskDirectory(taskdir);
		for (auto tp = taskDirectory.read(); tp != nullptr; tp = taskDirectory.read()) {
		std::string piddir;
		if (getValidTidDir(tp, &piddir))
		threads.push_back(android::base::Basename(piddir));
		}
		const auto message = state + " "s + llkFormat(procp->count) + " " +
		std::to_string(ppid) + "->" + std::to_string(pid) + "->" +
		std::to_string(tid) + " " + process_comm + " [panic]";
		std::to_string(tid) + " " + process_comm + " [panic]\n" +
		" thread group: {" + android::base::Join(threads, ",") +
		"}";
		llkPanicKernel(dump, tid,
		(state == 'Z') ? "zombie" : (state == 'D') ? "driver" : "sleeping",
		message);