summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Farden <adam@farden.cz>2015-12-10 21:03:31 +0100
committerChirayu Desai <chirayudesai1@gmail.com>2016-01-20 20:33:28 +0530
commit68fe4a7352c4d22a106f6729e7981ed447e8056b (patch)
tree7527367dc6cce7cbf6376cb5d5b5ee0086675d7b
parent052319e7f375e0549872ca418b5f8d8de34bc0fa (diff)
downloadandroid_hardware_qcom_keymaster-68fe4a7352c4d22a106f6729e7981ed447e8056b.tar.gz
android_hardware_qcom_keymaster-68fe4a7352c4d22a106f6729e7981ed447e8056b.tar.bz2
android_hardware_qcom_keymaster-68fe4a7352c4d22a106f6729e7981ed447e8056b.zip
Disable ION_HEAP_MASK_COMPATIBILITY_WA on Sony 3.10 Kernel
Set SONY_BF64_KERNEL_VARIANT := true, the same flag as used in build/ to pick the HALs Signed-off-by: Adam Farden <adam@farden.cz> Signed-off-by: Chirayu Desai <chirayudesai1@gmail.com> Change-Id: Id08346823701bc7cd97414ca2743f3719a998973
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 6a4dcb8..2e41df8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,9 +5,11 @@ ifneq ($(filter msm8960 msm8226 msm8974 msm8610 msm8084 apq8084 msm8916 msm8952
keymaster-def := -fvisibility=hidden -Wall
ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+ifneq ($(SONY_BF64_KERNEL_VARIANT),true)
ifneq ($(filter msm8960 msm8226 msm8974 msm8610 msm8084 apq8084,$(TARGET_BOARD_PLATFORM)),)
keymaster-def += -D_ION_HEAP_MASK_COMPATIBILITY_WA
endif
+endif
else
ifeq ($(TARGET_BOARD_PLATFORM),msm8084)
keymaster-def += -D_ION_HEAP_MASK_COMPATIBILITY_WA