diff options
| author | Elliott Hughes <enh@google.com> | 2016-06-16 00:33:02 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-16 00:33:02 +0200 |
| commit | b36980cc09971d3cc1125eb72d6ddbdbea82adcb (patch) | |
| tree | 89ec9fd317b3354854b872bba129b5873ddacbe7 /Android.mk | |
| parent | Merge \\\"Add bootloader_message_ab struct.\\\" am: 59f04b9982 am: f57d7f02c9 (diff) | |
| parent | resolve merge conflicts of 179c0d8 to stage-aosp-master (diff) | |
| download | android_bootable_recovery-b36980cc09971d3cc1125eb72d6ddbdbea82adcb.tar android_bootable_recovery-b36980cc09971d3cc1125eb72d6ddbdbea82adcb.tar.gz android_bootable_recovery-b36980cc09971d3cc1125eb72d6ddbdbea82adcb.tar.bz2 android_bootable_recovery-b36980cc09971d3cc1125eb72d6ddbdbea82adcb.tar.lz android_bootable_recovery-b36980cc09971d3cc1125eb72d6ddbdbea82adcb.tar.xz android_bootable_recovery-b36980cc09971d3cc1125eb72d6ddbdbea82adcb.tar.zst android_bootable_recovery-b36980cc09971d3cc1125eb72d6ddbdbea82adcb.zip | |
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk index d21c18346..2034d604f 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) @@ -71,8 +79,8 @@ LOCAL_STATIC_LIBRARIES := \ libext4_utils_static \ libsparse_static \ libminzip \ + libmounts \ libz \ - libmtdutils \ libminadbd \ libfusesideload \ libminui \ @@ -90,11 +98,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 ifeq ($(AB_OTA_UPDATER),true) LOCAL_CFLAGS += -DAB_OTA_UPDATER=1 @@ -150,7 +155,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 \ |