From 31344a3b2f0adbb226134aacf10f70712775b78e Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 29 Nov 2017 12:13:41 -0600 Subject: Better compatibility across 8.0.0 trees Change-Id: Ic8200da4e99826736e002a1ab5f9e5f967e84193 --- crypto/ext4crypt/Android.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'crypto') diff --git a/crypto/ext4crypt/Android.mk b/crypto/ext4crypt/Android.mk index b32f3841a..af5ab3af0 100644 --- a/crypto/ext4crypt/Android.mk +++ b/crypto/ext4crypt/Android.mk @@ -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 - LOCAL_SRC_FILES += Weaver1.cpp - LOCAL_SHARED_LIBRARIES += android.hardware.weaver@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 -- cgit v1.2.3