commit 9a319f01f8768a1342c3f1c684f04c112a51f45c
author Tao Bao <tbao@google.com> Thu Jan 04 13:19:11 2018 -0800
committer Tao Bao <tbao@google.com> Fri Apr 27 21:13:57 2018 -0700
tree 78ab4e2c4138f54be8a2f112de0246b1dc0d8898
parent 3de375608177378b16f12104b464b3ad7dfb57ab

Merge libmounts into libotautil.

Export its header (mounts.h) from there, and drop the dot dot dependency
from libupdater / updater.

Test: mmma bootable/recovery
Test: recovery_component_test
Change-Id: Ic26a6b9b78a34dbe1f178b138f3abaafffbec44c

updater/Android.mk

diff --git a/updater/Android.mk b/updater/Android.mk
index 6f334ee..4762664 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -24,14 +24,13 @@
 
 updater_common_static_libraries := \
     libapplypatch \
-    libbspatch \
-    libedify \
-    libziparchive \
-    libotautil \
     libbootloader_message \
-    libutils \
-    libmounts \
+    libedify \
     libotafault \
+    libotautil \
+    libbspatch \
+    libziparchive \
+    libutils \
     libext4_utils \
     libfec \
     libfec_rs \
@@ -61,7 +60,6 @@
     blockimg.cpp
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/.. \
     $(LOCAL_PATH)/include \
     external/e2fsprogs/misc
 
@@ -87,7 +85,6 @@
     updater.cpp
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/.. \
     $(LOCAL_PATH)/include
 
 LOCAL_CFLAGS := \

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index 6732ab8..5623c33 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -57,10 +57,10 @@
 #include <ziparchive/zip_archive.h>
 
 #include "edify/expr.h"
-#include "mounts.h"
 #include "otafault/ota_io.h"
 #include "otautil/DirUtil.h"
 #include "otautil/error_code.h"
+#include "otautil/mounts.h"
 #include "otautil/print_sha1.h"
 #include "updater/updater.h"