summaryrefslogtreecommitdiffstats
path: root/otautil
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-10-01 21:08:33 +0200
committerTao Bao <tbao@google.com>2019-10-01 21:13:04 +0200
commitd628cfc15316605ad541c4cec683462a57458d75 (patch)
treedab464db716b2dbc813bfbe937e70135430b538f /otautil
parentotautil: roots.cpp no longer needs 'mounts.h'. (diff)
downloadandroid_bootable_recovery-d628cfc15316605ad541c4cec683462a57458d75.tar
android_bootable_recovery-d628cfc15316605ad541c4cec683462a57458d75.tar.gz
android_bootable_recovery-d628cfc15316605ad541c4cec683462a57458d75.tar.bz2
android_bootable_recovery-d628cfc15316605ad541c4cec683462a57458d75.tar.lz
android_bootable_recovery-d628cfc15316605ad541c4cec683462a57458d75.tar.xz
android_bootable_recovery-d628cfc15316605ad541c4cec683462a57458d75.tar.zst
android_bootable_recovery-d628cfc15316605ad541c4cec683462a57458d75.zip
Diffstat (limited to '')
-rw-r--r--otautil/Android.bp1
-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
3 files changed, 1 insertions, 2 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/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