summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-06-15 23:55:15 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-06-15 23:55:15 +0200
commit179c0d80bccb6451c5552ae76dfe7081c8cf96bb (patch)
tree9f5a90261cb85217cda931969aefdc04476d9fa2 /Android.mk
parentMerge "Add bootloader_message_ab struct." (diff)
parentRemove obsolete MTD support. (diff)
downloadandroid_bootable_recovery-179c0d80bccb6451c5552ae76dfe7081c8cf96bb.tar
android_bootable_recovery-179c0d80bccb6451c5552ae76dfe7081c8cf96bb.tar.gz
android_bootable_recovery-179c0d80bccb6451c5552ae76dfe7081c8cf96bb.tar.bz2
android_bootable_recovery-179c0d80bccb6451c5552ae76dfe7081c8cf96bb.tar.lz
android_bootable_recovery-179c0d80bccb6451c5552ae76dfe7081c8cf96bb.tar.xz
android_bootable_recovery-179c0d80bccb6451c5552ae76dfe7081c8cf96bb.tar.zst
android_bootable_recovery-179c0d80bccb6451c5552ae76dfe7081c8cf96bb.zip
Diffstat (limited to '')
-rw-r--r--Android.mk22
1 files changed, 13 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index 95e806ff9..384eefe3f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,15 +17,23 @@ LOCAL_PATH := $(call my-dir)
# libfusesideload (static library)
# ===============================
include $(CLEAR_VARS)
-
LOCAL_SRC_FILES := fuse_sideload.cpp
LOCAL_CLANG := true
-LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter
+LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -Werror
LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
LOCAL_MODULE := libfusesideload
LOCAL_STATIC_LIBRARIES := libcutils libc libcrypto_static
include $(BUILD_STATIC_LIBRARY)
+# libmounts (static library)
+# ===============================
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := mounts.cpp
+LOCAL_CLANG := true
+LOCAL_CFLAGS := -Wall -Wno-unused-parameter -Werror
+LOCAL_MODULE := libmounts
+include $(BUILD_STATIC_LIBRARY)
+
# recovery (static executable)
# ===============================
include $(CLEAR_VARS)
@@ -70,8 +78,8 @@ LOCAL_STATIC_LIBRARIES := \
libext4_utils_static \
libsparse_static \
libminzip \
+ libmounts \
libz \
- libmtdutils \
libminadbd \
libfusesideload \
libminui \
@@ -89,11 +97,8 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_HAL_STATIC_LIBRARIES := libhealthd
-ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
- LOCAL_CFLAGS += -DUSE_EXT4
- LOCAL_C_INCLUDES += system/extras/ext4_utils
- LOCAL_STATIC_LIBRARIES += libext4_utils_static libz
-endif
+LOCAL_C_INCLUDES += system/extras/ext4_utils
+LOCAL_STATIC_LIBRARIES += libext4_utils_static libz
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
@@ -145,7 +150,6 @@ include $(BUILD_STATIC_LIBRARY)
include $(LOCAL_PATH)/minui/Android.mk \
$(LOCAL_PATH)/minzip/Android.mk \
$(LOCAL_PATH)/minadbd/Android.mk \
- $(LOCAL_PATH)/mtdutils/Android.mk \
$(LOCAL_PATH)/tests/Android.mk \
$(LOCAL_PATH)/tools/Android.mk \
$(LOCAL_PATH)/edify/Android.mk \