diff options
| author | Tao Bao <tbao@google.com> | 2019-10-01 23:52:54 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-01 23:52:54 +0200 |
| commit | abdf3b93b6e07ae54789c858475b1c7da7d906d2 (patch) | |
| tree | dab464db716b2dbc813bfbe937e70135430b538f | |
| parent | Merge "Remove libhidltransport deps" am: e2ca8ba293 am: 3746d95338 (diff) | |
| parent | Merge changes I6c35d2e4,If16c3e19 am: c3f32b95e5 (diff) | |
| download | android_bootable_recovery-abdf3b93b6e07ae54789c858475b1c7da7d906d2.tar android_bootable_recovery-abdf3b93b6e07ae54789c858475b1c7da7d906d2.tar.gz android_bootable_recovery-abdf3b93b6e07ae54789c858475b1c7da7d906d2.tar.bz2 android_bootable_recovery-abdf3b93b6e07ae54789c858475b1c7da7d906d2.tar.lz android_bootable_recovery-abdf3b93b6e07ae54789c858475b1c7da7d906d2.tar.xz android_bootable_recovery-abdf3b93b6e07ae54789c858475b1c7da7d906d2.tar.zst android_bootable_recovery-abdf3b93b6e07ae54789c858475b1c7da7d906d2.zip | |
| -rw-r--r-- | otautil/Android.bp | 1 | ||||
| -rw-r--r-- | otautil/roots.cpp | 1 | ||||
| -rw-r--r-- | updater/Android.bp | 1 | ||||
| -rw-r--r-- | updater/install.cpp | 1 | ||||
| -rw-r--r-- | updater/mounts.cpp (renamed from otautil/mounts.cpp) | 2 | ||||
| -rw-r--r-- | updater/mounts.h (renamed from otautil/include/otautil/mounts.h) | 0 | ||||
| -rw-r--r-- | updater/simulator_runtime.cpp | 2 | ||||
| -rw-r--r-- | updater/updater_runtime.cpp | 2 |
8 files changed, 4 insertions, 6 deletions
diff --git a/otautil/Android.bp b/otautil/Android.bp index 871dcae9a..6f816a17d 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 431551785..aa7809b54 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; diff --git a/updater/Android.bp b/updater/Android.bp index 872ef86db..8a60ef76a 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 b617f62c1..62ff87e76 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 index 951311bf3..943d35c75 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 index 6786c8d2e..6786c8d2e 100644 --- a/otautil/include/otautil/mounts.h +++ b/updater/mounts.h diff --git a/updater/simulator_runtime.cpp b/updater/simulator_runtime.cpp index d2074d69a..3ed7bf337 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 761f99975..c4222a56e 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, |