Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b29a5e27 authored by D. Andrei Măceș's avatar D. Andrei Măceș Committed by Ethan Yonker
Browse files

build: Consolidate the crypto_utils presence tests 

No point checking filesystem repeatedly/check may change in future

Change-Id: I0413b07b850f785eb5150c6ed18836cc56e94d6f
parent 4767caf1

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -302,6 +302,8 @@ ifeq ($(TW_INCLUDE_CRYPTO), true) 
        LOCAL_SHARED_LIBRARIES += libe4crypt

    endif

endif

WITH_CRYPTO_UTILS := \

    $(if $(wildcard system/core/libcrypto_utils/Android.mk),true)

ifeq ($(TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID), true)

    LOCAL_CFLAGS += -DTW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID

endif

minadbd/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) 
    LOCAL_SHARED_LIBRARIES += libmincrypttwrp

    LOCAL_CFLAGS += -DUSE_MINCRYPT

else

    LOCAL_SHARED_LIBRARIES += libcrypto

    LOCAL_SHARED_LIBRARIES += libcrypto \

    $(if $(WITH_CRYPTO_UTILS),libcrypto_utils)

endif



include $(BUILD_SHARED_LIBRARY)

prebuilt/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0) 
    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libgccdemangle.so

endif

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0)

    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so



    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so \

    $(if $(WITH_CRYPTO_UTILS),$(TARGET_OUT_SHARED_LIBRARIES)/libcrypto_utils.so)

    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpackagelistparser.so

    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/liblzma.so

endif