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
This commit is contained in:
Tao Bao 2019-10-01 12:08:33 -07:00
parent 331e5c4c98
commit d628cfc153
7 changed files with 4 additions and 5 deletions

View file

@ -44,7 +44,6 @@ cc_library_static {
android: { android: {
srcs: [ srcs: [
"logging.cpp", "logging.cpp",
"mounts.cpp",
"parse_install_logs.cpp", "parse_install_logs.cpp",
"roots.cpp", "roots.cpp",
"thermalutil.cpp", "thermalutil.cpp",

View file

@ -81,6 +81,7 @@ cc_library_static {
"blockimg.cpp", "blockimg.cpp",
"commands.cpp", "commands.cpp",
"install.cpp", "install.cpp",
"mounts.cpp",
"updater.cpp", "updater.cpp",
], ],

View file

@ -60,7 +60,6 @@
#include "edify/updater_runtime_interface.h" #include "edify/updater_runtime_interface.h"
#include "otautil/dirutil.h" #include "otautil/dirutil.h"
#include "otautil/error_code.h" #include "otautil/error_code.h"
#include "otautil/mounts.h"
#include "otautil/print_sha1.h" #include "otautil/print_sha1.h"
#include "otautil/sysutil.h" #include "otautil/sysutil.h"

View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "otautil/mounts.h" #include "mounts.h"
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

View file

@ -32,7 +32,7 @@
#include <ext4_utils/wipe.h> #include <ext4_utils/wipe.h>
#include <selinux/label.h> #include <selinux/label.h>
#include "otautil/mounts.h" #include "mounts.h"
#include "otautil/sysutil.h" #include "otautil/sysutil.h"
std::string SimulatorRuntime::GetProperty(const std::string_view key, std::string SimulatorRuntime::GetProperty(const std::string_view key,

View file

@ -31,7 +31,7 @@
#include <selinux/label.h> #include <selinux/label.h>
#include <tune2fs.h> #include <tune2fs.h>
#include "otautil/mounts.h" #include "mounts.h"
#include "otautil/sysutil.h" #include "otautil/sysutil.h"
std::string UpdaterRuntime::GetProperty(const std::string_view key, std::string UpdaterRuntime::GetProperty(const std::string_view key,