commit 648efd5a752e6e083526083f3458568643d9fd40
author Keith Mok <kmok@cyngn.com> Fri Dec 04 10:03:49 2015 -0800
committer Martinusbe <martinusbe@gmail.com> Thu Mar 10 10:40:19 2016 +0100
tree 5bdd63ae4c4391993ca38ead36d4503fdbb2b9b4
parent c8d4ace25328435c5102a85dc7dbb0260a324951

keymaster: add TARGET_PROVIDES_KEYMASTER

Qcom makes keymaster a propertiies blob in M.
To maintain compatibility with Cyanogenmod builds,
add a flag to optionally disable building keymaster here.

Change-Id: Ibb95cb54651ec5af266504e66f1078adaa53c0d8

Android.mk

diff --git a/Android.mk b/Android.mk
index 219aa32..16929e7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
+ifneq ($(TARGET_PROVIDES_KEYMASTER),true)
 ifneq ($(filter msm8960 msm8226 msm8974 msm8610 msm8084 apq8084 msm8916 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),)
 
 keymaster-def := -fvisibility=hidden -Wall
@@ -41,3 +42,4 @@
 include $(BUILD_SHARED_LIBRARY)
 
 endif # TARGET_BOARD_PLATFORM
+endif # TARGET_PROVIDES_KEYMASTER