From 9a319f01f8768a1342c3f1c684f04c112a51f45c Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 4 Jan 2018 13:19:11 -0800 Subject: 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 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'updater/Android.mk') 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 := \ -- cgit v1.2.3