summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2016-07-01 00:55:19 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-07-01 00:55:19 +0200
commitfb1dca351d680ae6dab0fe483717a53d6e02b063 (patch)
tree0b491d65092cfa935a9ddfd155067594d6f5988c /Android.mk
parentMerge \\\\"Fix install.h\\\\'s use of attribute printf.\\\\" am: a82ee456bb am: 691db7ba77 am: 7c4a34195f (diff)
parentresolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp (diff)
downloadandroid_bootable_recovery-fb1dca351d680ae6dab0fe483717a53d6e02b063.tar
android_bootable_recovery-fb1dca351d680ae6dab0fe483717a53d6e02b063.tar.gz
android_bootable_recovery-fb1dca351d680ae6dab0fe483717a53d6e02b063.tar.bz2
android_bootable_recovery-fb1dca351d680ae6dab0fe483717a53d6e02b063.tar.lz
android_bootable_recovery-fb1dca351d680ae6dab0fe483717a53d6e02b063.tar.xz
android_bootable_recovery-fb1dca351d680ae6dab0fe483717a53d6e02b063.tar.zst
android_bootable_recovery-fb1dca351d680ae6dab0fe483717a53d6e02b063.zip
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk14
1 files changed, 8 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 2034d604f..43236fe3c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,7 +41,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
adb_install.cpp \
asn1_decoder.cpp \
- bootloader.cpp \
device.cpp \
fuse_sdcard_provider.cpp \
install.cpp \
@@ -76,6 +75,7 @@ LOCAL_C_INCLUDES += \
LOCAL_STATIC_LIBRARIES := \
libbatterymonitor \
+ libbootloader_message \
libext4_utils_static \
libsparse_static \
libminzip \
@@ -152,14 +152,16 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := libcrypto_utils_static libcrypto_static
include $(BUILD_STATIC_LIBRARY)
-include $(LOCAL_PATH)/minui/Android.mk \
- $(LOCAL_PATH)/minzip/Android.mk \
+include \
+ $(LOCAL_PATH)/applypatch/Android.mk \
+ $(LOCAL_PATH)/bootloader_message/Android.mk \
+ $(LOCAL_PATH)/edify/Android.mk \
$(LOCAL_PATH)/minadbd/Android.mk \
+ $(LOCAL_PATH)/minui/Android.mk \
+ $(LOCAL_PATH)/minzip/Android.mk \
+ $(LOCAL_PATH)/otafault/Android.mk \
$(LOCAL_PATH)/tests/Android.mk \
$(LOCAL_PATH)/tools/Android.mk \
- $(LOCAL_PATH)/edify/Android.mk \
$(LOCAL_PATH)/uncrypt/Android.mk \
- $(LOCAL_PATH)/otafault/Android.mk \
$(LOCAL_PATH)/updater/Android.mk \
$(LOCAL_PATH)/update_verifier/Android.mk \
- $(LOCAL_PATH)/applypatch/Android.mk