commit 2b4fe06d89c03da8081afaa4c876ccaabe2ac46a
author Ethan Chen <intervigil@gmail.com> Fri Jan 09 11:54:48 2015 -0800
committer Josue Rivera <prbassplayer@gmail.com> Mon Dec 28 22:28:33 2015 +0100
tree 8ea56fbfbb0be7c779f54191828d651445756789
parent 280adac94333c509f789afe8818e25f3838d172e

keymaster: Set HEAP_MASK_COMPATIBILITY by platform for QCOM_HARDWARE

* Google kernels have a separate hack to handle this, only set by
  platform for QCOM_HARDWARE devices.

Change-Id: Iab91cee4922e1b3467691a04eb1c5061705fbab3

Android.mk

diff --git a/Android.mk b/Android.mk
index 504b6ba..19e78f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,9 +3,15 @@
 ifneq ($(filter msm8960 msm8226 msm8974 msm8610 msm8084 apq8084 msm8916 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),)
 
 keymaster-def := -fvisibility=hidden -Wall
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+ifneq ($(filter msm8960 msm8226 msm8974 msm8610 msm8084 apq8084,$(TARGET_BOARD_PLATFORM)),)
+keymaster-def += -D_ION_HEAP_MASK_COMPATIBILITY_WA
+endif
+else
 ifeq ($(TARGET_BOARD_PLATFORM),msm8084)
 keymaster-def += -D_ION_HEAP_MASK_COMPATIBILITY_WA
 endif
+endif
 
 include $(CLEAR_VARS)