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/otautil/roots.cpp b/otautil/roots.cpp index 43155178..aa7809b5 100644 --- a/otautil/roots.cpp +++ b/otautil/roots.cpp @@ -42,7 +42,6 @@ #include #include -#include "otautil/mounts.h" #include "otautil/sysutil.h" using android::fs_mgr::Fstab; 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 #include 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 #include -#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 #include -#include "otautil/mounts.h" +#include "mounts.h" #include "otautil/sysutil.h" std::string UpdaterRuntime::GetProperty(const std::string_view key,