summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
Diffstat (limited to 'updater')
-rw-r--r--updater/Android.mk11
-rw-r--r--updater/install.cpp2
2 files changed, 5 insertions, 8 deletions
diff --git a/updater/Android.mk b/updater/Android.mk
index 6f334ee18..476266400 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -24,14 +24,13 @@ tune2fs_static_libraries := \
updater_common_static_libraries := \
libapplypatch \
- libbspatch \
+ libbootloader_message \
libedify \
- libziparchive \
+ libotafault \
libotautil \
- libbootloader_message \
+ libbspatch \
+ libziparchive \
libutils \
- libmounts \
- libotafault \
libext4_utils \
libfec \
libfec_rs \
@@ -61,7 +60,6 @@ LOCAL_SRC_FILES := \
blockimg.cpp
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/include \
external/e2fsprogs/misc
@@ -87,7 +85,6 @@ LOCAL_SRC_FILES := \
updater.cpp
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/include
LOCAL_CFLAGS := \
diff --git a/updater/install.cpp b/updater/install.cpp
index 6732ab897..5623c3379 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"