Revert "libsnapshot::RemoveAllUpdateState log stack" am: 21ab3adc73 am: 27fa435820 (5299e2e6) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/Android.bp

+0 −16

Original line number	Diff line number	Diff line
		@@ -96,16 +96,6 @@ cc_library_static {
		static_libs: [
		"libfs_mgr_binder"
		],

		shared_libs: [
		// TODO(b/148818798): remove when parent bug is fixed
		"libutilscallstack",
		],
		cflags: [
		"-g",
		"-O0",
		"-DLIBSNAPSHOT_USE_CALLSTACK",
		],
		}

		cc_library_static {
		@@ -179,9 +169,6 @@ cc_defaults {
		"libsparse",
		"libutils",
		"libz",

		// TODO(b/148818798): remove when parent bug is fixed
		"libutilscallstack",
		],
		static_libs: [
		"libfs_mgr",
		@@ -231,8 +218,5 @@ cc_binary {
		"libprotobuf-cpp-lite",
		"libstatslog",
		"libutils",

		// TODO(b/148818798): remove when parent bug is fixed.
		"libutilscallstack",
		],
		}

+0 −19

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@
		#include <sys/unistd.h>

		#include <optional>
		#include <sstream>
		#include <thread>
		#include <unordered_set>

		@@ -38,10 +37,6 @@
		#include <libfiemap/image_manager.h>
		#include <liblp/liblp.h>

		#ifdef LIBSNAPSHOT_USE_CALLSTACK
		#include <utils/CallStack.h>
		#endif

		#include <android/snapshot/snapshot.pb.h>
		#include <libsnapshot/snapshot_stats.h>
		#include "device_info.h"
		@@ -228,20 +223,6 @@ bool SnapshotManager::RemoveAllUpdateState(LockedFile* lock, const std::function

		LOG(INFO) << "Removing all update state.";

		#ifdef LIBSNAPSHOT_USE_CALLSTACK
		LOG(WARNING) << "Logging stack; see b/148818798.";
		// Do not use CallStack's log functions because snapshotctl relies on
		// android-base/logging to save log to files.
		// TODO(b/148818798): remove this before we ship.
		CallStack callstack;
		callstack.update();
		auto callstack_str = callstack.toString();
		LOG(WARNING) << callstack_str.c_str();
		std::stringstream path;
		path << "/data/misc/snapshotctl_log/libsnapshot." << Now() << ".log";
		android::base::WriteStringToFile(callstack_str.c_str(), path.str());
		#endif

		if (!RemoveAllSnapshots(lock)) {
		LOG(ERROR) << "Could not remove all snapshots";
		return false;