From 99af7666682234f0a75f9ee7d0005c0535704e92 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Thu, 15 Sep 2016 14:48:29 -0500 Subject: Fix libcrypto dependency in 6.0 trees Change-Id: Ie230ed5f3db38a62305e03e4f9819e4aca816e16 --- minadbd/Android.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'minadbd') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index ef5994539..3d675dda5 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -23,7 +23,15 @@ LOCAL_CFLAGS := $(minadbd_cflags) LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. system/core/adb LOCAL_WHOLE_STATIC_LIBRARIES := libadbd -LOCAL_SHARED_LIBRARIES := libbase liblog libcutils libc libcrypto +LOCAL_SHARED_LIBRARIES := libbase liblog libcutils libc + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) + LOCAL_C_INCLUDES += $(LOCAL_PATH)/libmincrypt/includes + LOCAL_SHARED_LIBRARIES += libmincrypttwrp + LOCAL_CFLAGS += -DUSE_MINCRYPT +else + LOCAL_SHARED_LIBRARIES += libcrypto +endif include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3