Merge "Make GetActiveDsu() static inline" am: 53ad534d6f am: bb1950da87

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1452415

Change-Id: Idc67ebeb75d93ab4a41b9f6279b1db67a6c53c51

2 files changed, 5 insertions, 5 deletions

diff --git a/include/libgsi/libgsi.h b/include/libgsi/libgsi.h
index fbe2f17..ed47767 100644
--- a/include/libgsi/libgsi.h
+++ b/include/libgsi/libgsi.h
@@ -18,6 +18,8 @@
 
 #include <string>
 
+#include <android-base/file.h>
+
 namespace android {
 namespace gsi {
 
@@ -55,7 +57,9 @@ static constexpr int kMaxBootAttempts = 1;
 
 // Get the currently active dsu slot
 // Return true on success
-bool GetActiveDsu(std::string* active_dsu);
+static inline bool GetActiveDsu(std::string* active_dsu) {
+    return android::base::ReadFileToString(kDsuActiveFile, active_dsu);
+}
 
 // Returns true if the currently running system image is a live GSI.
 bool IsGsiRunning();
diff --git a/libgsi.cpp b/libgsi.cpp
index b342cc5..3b0db51 100644
--- a/libgsi.cpp
+++ b/libgsi.cpp
@@ -37,10 +37,6 @@ using android::base::ReadFileToString;
 using android::base::Split;
 using android::base::unique_fd;
 
-bool GetActiveDsu(std::string* active_dsu) {
-    return android::base::ReadFileToString(kDsuActiveFile, active_dsu);
-}
-
 bool IsGsiRunning() {
     return !access(kGsiBootedIndicatorFile, F_OK);
 }