From 331e5c4c98907b471e3b871796508cacccbf06f0 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Tue, 1 Oct 2019 12:01:08 -0700
Subject: [PATCH 1/2] otautil: roots.cpp no longer needs 'mounts.h'.

Commit 0f339e27bb753b0dafb17a315fa4b029ba31aa28 moved part of the mounts
implementation into libfs_mgr. As a result, otautil/roots.cpp no longer
depends on anything in the local otautil/mounts.h.

Test: mmma bootable/recovery
Change-Id: If16c3e19a62933358fb0002a10e8556a99f9d29a
---
 otautil/roots.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/otautil/roots.cpp b/otautil/roots.cpp
index 43155178..aa7809b5 100644
--- a/otautil/roots.cpp
+++ b/otautil/roots.cpp
@@ -42,7 +42,6 @@
 #include <fs_mgr/roots.h>
 #include <fs_mgr_dm_linear.h>
 
-#include "otautil/mounts.h"
 #include "otautil/sysutil.h"
 
 using android::fs_mgr::Fstab;

From d628cfc15316605ad541c4cec683462a57458d75 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Tue, 1 Oct 2019 12:08:33 -0700
Subject: [PATCH 2/2] Move mounts.cpp from libotautil into libupdater.

All the active users of mounts.h now live in updater/.

Test: mmma bootable/recovery
Test: Run recovery_unit_test on taimen.
Test: Code search shows no reference to otautil/mounts.h in device dirs.
Change-Id: I6c35d2e403e92a0111102d00aa4773f4f524650e
---
 otautil/Android.bp                            | 1 -
 updater/Android.bp                            | 1 +
 updater/install.cpp                           | 1 -
 {otautil => updater}/mounts.cpp               | 2 +-
 {otautil/include/otautil => updater}/mounts.h | 0
 updater/simulator_runtime.cpp                 | 2 +-
 updater/updater_runtime.cpp                   | 2 +-
 7 files changed, 4 insertions(+), 5 deletions(-)
 rename {otautil => updater}/mounts.cpp (98%)
 rename {otautil/include/otautil => updater}/mounts.h (100%)

diff --git a/otautil/Android.bp b/otautil/Android.bp
index 871dcae9..6f816a17 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -44,7 +44,6 @@ cc_library_static {
         android: {
             srcs: [
                 "logging.cpp",
-                "mounts.cpp",
                 "parse_install_logs.cpp",
                 "roots.cpp",
                 "thermalutil.cpp",
diff --git a/updater/Android.bp b/updater/Android.bp
index 872ef86d..8a60ef76 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -81,6 +81,7 @@ cc_library_static {
         "blockimg.cpp",
         "commands.cpp",
         "install.cpp",
+        "mounts.cpp",
         "updater.cpp",
     ],
 
diff --git a/updater/install.cpp b/updater/install.cpp
index b617f62c..62ff87e7 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -60,7 +60,6 @@
 #include "edify/updater_runtime_interface.h"
 #include "otautil/dirutil.h"
 #include "otautil/error_code.h"
-#include "otautil/mounts.h"
 #include "otautil/print_sha1.h"
 #include "otautil/sysutil.h"
 
diff --git a/otautil/mounts.cpp b/updater/mounts.cpp
similarity index 98%
rename from otautil/mounts.cpp
rename to updater/mounts.cpp
index 951311bf..943d35c7 100644
--- a/otautil/mounts.cpp
+++ b/updater/mounts.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "otautil/mounts.h"
+#include "mounts.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/otautil/include/otautil/mounts.h b/updater/mounts.h
similarity index 100%
rename from otautil/include/otautil/mounts.h
rename to updater/mounts.h
diff --git a/updater/simulator_runtime.cpp b/updater/simulator_runtime.cpp
index d2074d69..3ed7bf33 100644
--- a/updater/simulator_runtime.cpp
+++ b/updater/simulator_runtime.cpp
@@ -32,7 +32,7 @@
 #include <ext4_utils/wipe.h>
 #include <selinux/label.h>
 
-#include "otautil/mounts.h"
+#include "mounts.h"
 #include "otautil/sysutil.h"
 
 std::string SimulatorRuntime::GetProperty(const std::string_view key,
diff --git a/updater/updater_runtime.cpp b/updater/updater_runtime.cpp
index 761f9997..c4222a56 100644
--- a/updater/updater_runtime.cpp
+++ b/updater/updater_runtime.cpp
@@ -31,7 +31,7 @@
 #include <selinux/label.h>
 #include <tune2fs.h>
 
-#include "otautil/mounts.h"
+#include "mounts.h"
 #include "otautil/sysutil.h"
 
 std::string UpdaterRuntime::GetProperty(const std::string_view key,