diff options
| author | Tao Bao <tbao@google.com> | 2019-10-01 23:18:42 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-01 23:18:42 +0200 |
| commit | c3f32b95e5a377ee35583df9a698650078a46892 (patch) | |
| tree | dab464db716b2dbc813bfbe937e70135430b538f /otautil | |
| parent | Merge "Remove libhidltransport deps" (diff) | |
| parent | Move mounts.cpp from libotautil into libupdater. (diff) | |
| download | android_bootable_recovery-c3f32b95e5a377ee35583df9a698650078a46892.tar android_bootable_recovery-c3f32b95e5a377ee35583df9a698650078a46892.tar.gz android_bootable_recovery-c3f32b95e5a377ee35583df9a698650078a46892.tar.bz2 android_bootable_recovery-c3f32b95e5a377ee35583df9a698650078a46892.tar.lz android_bootable_recovery-c3f32b95e5a377ee35583df9a698650078a46892.tar.xz android_bootable_recovery-c3f32b95e5a377ee35583df9a698650078a46892.tar.zst android_bootable_recovery-c3f32b95e5a377ee35583df9a698650078a46892.zip | |
Diffstat (limited to '')
| -rw-r--r-- | otautil/Android.bp | 1 | ||||
| -rw-r--r-- | otautil/roots.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 |
4 files changed, 1 insertions, 3 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/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 |