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

Commit 31344a3b authored by Ethan Yonker's avatar Ethan Yonker
Browse files

Better compatibility across 8.0.0 trees 

Change-Id: Ic8200da4e99826736e002a1ab5f9e5f967e84193
parent 06c62190

crypto/ext4crypt/Android.mk

+11 −4
Original line number Diff line number Diff line
@@ -15,12 +15,19 @@ ifneq ($(wildcard hardware/libhardware/include/hardware/keymaster0.h),) 
    LOCAL_C_INCLUDES +=  external/boringssl/src/include

endif

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0)

    LOCAL_CFLAGS += -DUSE_KEYSTORAGE_3 -DHAVE_LIBKEYUTILS -DHAVE_SYNTH_PWD_SUPPORT -DHAVE_GATEKEEPER1

    LOCAL_CFLAGS += -DUSE_KEYSTORAGE_3 -DHAVE_GATEKEEPER1

    LOCAL_SRC_FILES += Keymaster3.cpp KeyStorage3.cpp

    LOCAL_SHARED_LIBRARIES += android.hardware.keymaster@3.0 libkeystore_binder libhidlbase libutils libkeyutils libbinder

    LOCAL_SHARED_LIBRARIES += android.hardware.keymaster@3.0 libkeystore_binder libhidlbase libutils libbinder

    LOCAL_SHARED_LIBRARIES += android.hardware.gatekeeper@1.0

    ifneq ($(wildcard hardware/interfaces/weaver/Android.bp),)

        LOCAL_CFLAGS += -DHAVE_SYNTH_PWD_SUPPORT

        LOCAL_SRC_FILES += Weaver1.cpp

        LOCAL_SHARED_LIBRARIES += android.hardware.weaver@1.0

    endif

    ifneq ($(wildcard system/core/libkeyutils/Android.bp),)

        LOCAL_CFLAGS += -DHAVE_LIBKEYUTILS

        LOCAL_SHARED_LIBRARIES += libkeyutils

    endif

else

    LOCAL_SRC_FILES += Keymaster.cpp KeyStorage.cpp

endif

prebuilt/Android.mk

+10 −4
Original line number Diff line number Diff line
@@ -195,10 +195,14 @@ ifeq ($(TW_INCLUDE_CRYPTO), true) 
            RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/keystore_cli

            RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/servicemanager

            RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.system.wifi.keystore@1.0.so

            ifneq ($(wildcard system/keymaster/keymaster_stl.cpp),)

                RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster_portable.so

                RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster_staging.so

            endif

            RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libwifikeystorehal.so

            ifneq ($(wildcard hardware/interfaces/weaver/Android.bp),)

                RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.weaver@1.0.so

            endif

            RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhardware_legacy.so

        else

            RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeymaster1.so
@@ -300,8 +304,10 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0) 
    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libvintf.so

    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libtinyxml2.so

    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/android.hidl.token@1.0.so

    ifneq ($(wildcard system/core/libkeyutils/Android.bp),)

        RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeyutils.so

    endif

endif



TWRP_AUTOGEN := $(intermediates)/teamwin

GEN := $(intermediates)/teamwin