summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMattias Nissler <mnissler@google.com>2016-04-13 03:49:17 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-04-13 03:49:17 +0200
commitecd32c786c1469e476b29d13c3a25663d593da62 (patch)
tree571fa80724f0356932d702fc75376e126d5a8c6d /Android.mk
parentresolve merge conflicts of a58a6db to nyc-dev-plus-aosp (diff)
parentresolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp (diff)
downloadandroid_bootable_recovery-ecd32c786c1469e476b29d13c3a25663d593da62.tar
android_bootable_recovery-ecd32c786c1469e476b29d13c3a25663d593da62.tar.gz
android_bootable_recovery-ecd32c786c1469e476b29d13c3a25663d593da62.tar.bz2
android_bootable_recovery-ecd32c786c1469e476b29d13c3a25663d593da62.tar.lz
android_bootable_recovery-ecd32c786c1469e476b29d13c3a25663d593da62.tar.xz
android_bootable_recovery-ecd32c786c1469e476b29d13c3a25663d593da62.tar.zst
android_bootable_recovery-ecd32c786c1469e476b29d13c3a25663d593da62.zip
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 61ec5b12b..355f4d841 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,7 +23,7 @@ LOCAL_CLANG := true
LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter
LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
LOCAL_MODULE := libfusesideload
-LOCAL_STATIC_LIBRARIES := libcutils libc libmincrypt
+LOCAL_STATIC_LIBRARIES := libcutils libc libcrypto_static
include $(BUILD_STATIC_LIBRARY)
# recovery (static executable)
@@ -73,12 +73,13 @@ LOCAL_STATIC_LIBRARIES := \
libminzip \
libz \
libmtdutils \
- libmincrypt \
libminadbd \
libfusesideload \
libminui \
libpng \
libfs_mgr \
+ libcrypto_utils_static \
+ libcrypto_static \
libbase \
libcutils \
libutils \
@@ -139,6 +140,7 @@ LOCAL_SRC_FILES := \
asn1_decoder.cpp \
verifier.cpp \
ui.cpp
+LOCAL_STATIC_LIBRARIES := libcrypto_utils_static libcrypto_static
include $(BUILD_STATIC_LIBRARY)
include $(LOCAL_PATH)/minui/Android.mk \