diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2016-09-15 21:48:29 +0200 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2016-09-15 21:57:39 +0200 |
| commit | 99af7666682234f0a75f9ee7d0005c0535704e92 (patch) | |
| tree | 10ab92939ac03954491c7bc2d85458fa304492ce | |
| parent | Clean up PartitionSettings (diff) | |
| download | android_bootable_recovery-99af7666682234f0a75f9ee7d0005c0535704e92.tar android_bootable_recovery-99af7666682234f0a75f9ee7d0005c0535704e92.tar.gz android_bootable_recovery-99af7666682234f0a75f9ee7d0005c0535704e92.tar.bz2 android_bootable_recovery-99af7666682234f0a75f9ee7d0005c0535704e92.tar.lz android_bootable_recovery-99af7666682234f0a75f9ee7d0005c0535704e92.tar.xz android_bootable_recovery-99af7666682234f0a75f9ee7d0005c0535704e92.tar.zst android_bootable_recovery-99af7666682234f0a75f9ee7d0005c0535704e92.zip | |
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | minadbd/Android.mk | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 62ef11a5c..175b69ebc 100644 --- a/Android.mk +++ b/Android.mk @@ -547,7 +547,7 @@ LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libfusesideload LOCAL_SHARED_LIBRARIES := libcutils libc -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) +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 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) |