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
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 := \