From 26d10f158446b898c22e3fdef1e730255e48fab0 Mon Sep 17 00:00:00 2001
From: Shengsong Tan <sstan@google.com>
Date: Thu, 12 Sep 2024 06:44:20 +0000
Subject: [PATCH] Remove usage of base/logging.h in libfs_avb

As part of the effort to uprev libchrome in Android, we are
removing Android dependencies to libchrome utility functions
that are not strictly required.

This CL remove the usage of base/logging.h and replace by
android-base/logging.h

Bug: 360917504
Test: atest libfs_avb_internal_test

Change-Id: Ibcc476aebcff2fe5cfc2e3a3cd04168c02bc05f5
---
 fs_mgr/libfs_avb/avb_ops.cpp     | 1 +
 fs_mgr/libfs_avb/avb_util.cpp    | 1 +
 fs_mgr/libfs_avb/fs_avb.cpp      | 1 +
 fs_mgr/libfs_avb/fs_avb_util.cpp | 1 +
 fs_mgr/libfs_avb/util.cpp        | 1 +
 fs_mgr/libfs_avb/util.h          | 6 ------
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/fs_mgr/libfs_avb/avb_ops.cpp b/fs_mgr/libfs_avb/avb_ops.cpp
index cc1977619..7f0083997 100644
--- a/fs_mgr/libfs_avb/avb_ops.cpp
+++ b/fs_mgr/libfs_avb/avb_ops.cpp
@@ -34,6 +34,7 @@
 
 #include <string>
 
+#include <android-base/logging.h>
 #include <android-base/macros.h>
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
diff --git a/fs_mgr/libfs_avb/avb_util.cpp b/fs_mgr/libfs_avb/avb_util.cpp
index 90b65ce4c..37c9eabb8 100644
--- a/fs_mgr/libfs_avb/avb_util.cpp
+++ b/fs_mgr/libfs_avb/avb_util.cpp
@@ -21,6 +21,7 @@
 #include <array>
 #include <sstream>
 
+#include <android-base/logging.h>
 #include <android-base/file.h>
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
diff --git a/fs_mgr/libfs_avb/fs_avb.cpp b/fs_mgr/libfs_avb/fs_avb.cpp
index be48de6cc..4e6aaf500 100644
--- a/fs_mgr/libfs_avb/fs_avb.cpp
+++ b/fs_mgr/libfs_avb/fs_avb.cpp
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include <android-base/file.h>
+#include <android-base/logging.h>
 #include <android-base/parseint.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
diff --git a/fs_mgr/libfs_avb/fs_avb_util.cpp b/fs_mgr/libfs_avb/fs_avb_util.cpp
index 532622694..a74aa2587 100644
--- a/fs_mgr/libfs_avb/fs_avb_util.cpp
+++ b/fs_mgr/libfs_avb/fs_avb_util.cpp
@@ -20,6 +20,7 @@
 #include <string>
 #include <vector>
 
+#include <android-base/logging.h>
 #include <android-base/strings.h>
 #include <fstab/fstab.h>
 #include <libavb/libavb.h>
diff --git a/fs_mgr/libfs_avb/util.cpp b/fs_mgr/libfs_avb/util.cpp
index 7783d04e6..79c7b9494 100644
--- a/fs_mgr/libfs_avb/util.cpp
+++ b/fs_mgr/libfs_avb/util.cpp
@@ -22,6 +22,7 @@
 
 #include <thread>
 
+#include <android-base/logging.h>
 #include <android-base/stringprintf.h>
 #include <android-base/unique_fd.h>
 #include <linux/fs.h>
diff --git a/fs_mgr/libfs_avb/util.h b/fs_mgr/libfs_avb/util.h
index 29d1e9c54..570456046 100644
--- a/fs_mgr/libfs_avb/util.h
+++ b/fs_mgr/libfs_avb/util.h
@@ -20,12 +20,6 @@
 #include <string>
 #include <vector>
 
-#ifdef HOST_TEST
-#include <base/logging.h>
-#else
-#include <android-base/logging.h>
-#endif
-
 #include <android-base/result.h>
 
 using android::base::ErrnoError;