Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08213405 authored Sep 17, 2024 by Shengsong Tan Committed by Automerger Merge Worker Sep 17, 2024

Merge "Remove usage of base/logging.h in libfs_avb" into main am: e322d543 am: 3bef60cb

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3264992

Change-Id: Ib99460c2b16f5bff96a90f45583419a03382c3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 634832bb 3bef60cb

fs_mgr/libfs_avb/avb_ops.cpp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,7 @@

	#include <string>		#include <string>

			#include <android-base/logging.h>
	#include <android-base/macros.h>		#include <android-base/macros.h>
	#include <android-base/strings.h>		#include <android-base/strings.h>
	#include <android-base/unique_fd.h>		#include <android-base/unique_fd.h>

fs_mgr/libfs_avb/avb_util.cpp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	#include <array>		#include <array>
	#include <sstream>		#include <sstream>

			#include <android-base/logging.h>
	#include <android-base/file.h>		#include <android-base/file.h>
	#include <android-base/strings.h>		#include <android-base/strings.h>
	#include <android-base/unique_fd.h>		#include <android-base/unique_fd.h>

fs_mgr/libfs_avb/fs_avb.cpp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@
	#include <vector>		#include <vector>

	#include <android-base/file.h>		#include <android-base/file.h>
			#include <android-base/logging.h>
	#include <android-base/parseint.h>		#include <android-base/parseint.h>
	#include <android-base/stringprintf.h>		#include <android-base/stringprintf.h>
	#include <android-base/strings.h>		#include <android-base/strings.h>

fs_mgr/libfs_avb/fs_avb_util.cpp

+1 −0

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

			#include <android-base/logging.h>
	#include <android-base/strings.h>		#include <android-base/strings.h>
	#include <fstab/fstab.h>		#include <fstab/fstab.h>
	#include <libavb/libavb.h>		#include <libavb/libavb.h>

fs_mgr/libfs_avb/util.cpp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@

	#include <thread>		#include <thread>

			#include <android-base/logging.h>
	#include <android-base/stringprintf.h>		#include <android-base/stringprintf.h>
	#include <android-base/unique_fd.h>		#include <android-base/unique_fd.h>
	#include <linux/fs.h>		#include <linux/fs.h>