summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2015-01-09 11:54:48 -0800
committerEthan Chen <intervigil@gmail.com>2015-10-14 14:11:09 -0700
commitdde7edd0a18be43a2608f08dda3312e9fd593064 (patch)
tree8ea56fbfbb0be7c779f54191828d651445756789
parent337050111dcc1c6ac6ee06dc6a486b6d57f91725 (diff)
downloadandroid_hardware_qcom_keymaster-dde7edd0a18be43a2608f08dda3312e9fd593064.tar.gz
android_hardware_qcom_keymaster-dde7edd0a18be43a2608f08dda3312e9fd593064.tar.bz2
android_hardware_qcom_keymaster-dde7edd0a18be43a2608f08dda3312e9fd593064.zip
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
-rw-r--r--Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 504b6ba..19e78f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,9 +3,15 @@ LOCAL_PATH := $(call my-dir)
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)