From abf1fb00862cec01d457972419fbff4b95cc6300 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 24 Apr 2019 16:09:07 -0500 Subject: Switch between dependencies and modules Use LOCAL_REQUIRED_MODULES for Pie and up and LOCAL_ADDITIONAL_DEPENDENCIES for Oreo and down. Change-Id: I5365e782f98f3bbf4bf246be22c8f573824b65ee --- crypto/scrypt/Scrypt.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'crypto/scrypt/Scrypt.mk') diff --git a/crypto/scrypt/Scrypt.mk b/crypto/scrypt/Scrypt.mk index baa41eca6..67e73c80f 100644 --- a/crypto/scrypt/Scrypt.mk +++ b/crypto/scrypt/Scrypt.mk @@ -27,7 +27,11 @@ LOCAL_CFLAGS += $(target_c_flags) LOCAL_C_INCLUDES += $(target_c_includes) $(commands_recovery_local_path)/crypto/scrypt/lib/util LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= libscrypttwrp_static -LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0) + LOCAL_REQUIRED_MODULES := $(local_additional_dependencies) +else + LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) +endif include $(BUILD_STATIC_LIBRARY) ######################################## @@ -42,5 +46,9 @@ LOCAL_C_INCLUDES += $(host_c_includes) $(commands_recovery_local_path)/crypto/sc LOCAL_LDLIBS += -ldl LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= libscrypttwrp_static -LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0) + LOCAL_REQUIRED_MODULES := $(local_additional_dependencies) +else + LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) +endif include $(BUILD_HOST_STATIC_LIBRARY) -- cgit v1.2.3