From ceb7b8e5767aaac364d75c647ea130968e15f3ed Mon Sep 17 00:00:00 2001
From: that <github@that.at>
Date: Tue, 9 Dec 2014 23:15:16 +0100
Subject: crypto: fix build in < 5.0 tree

Change-Id: Ie4ed3e91cfb7e509bac1d6db885bd3f415d2b168
---
 crypto/lollipop/Android.mk | 2 +-
 crypto/lollipop/cryptfs.c  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/lollipop/Android.mk b/crypto/lollipop/Android.mk
index da25eac30..fb9860917 100644
--- a/crypto/lollipop/Android.mk
+++ b/crypto/lollipop/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-ifeq ($(TW_INCLUDE_L_CRYPTO), true)
+ifeq ($(TW_INCLUDE_CRYPTO), true)
 include $(CLEAR_VARS)
 
 common_c_includes := \
diff --git a/crypto/lollipop/cryptfs.c b/crypto/lollipop/cryptfs.c
index 90f1523d3..c6586cc49 100644
--- a/crypto/lollipop/cryptfs.c
+++ b/crypto/lollipop/cryptfs.c
@@ -131,6 +131,7 @@ static int keymaster_check_compatibility()
 
     printf("keymaster version is %d\n", keymaster_dev->common.module->module_api_version);
 
+#if (KEYMASTER_HEADER_VERSION >= 3)
     if (keymaster_dev->common.module->module_api_version
             < KEYMASTER_MODULE_API_VERSION_0_3) {
         rc = 0;
@@ -141,6 +142,7 @@ static int keymaster_check_compatibility()
         rc = 1;
     }
 
+#endif
 out:
     keymaster_close(keymaster_dev);
     return rc;
-- 
cgit v1.2.3