summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2017-08-01 14:22:08 -0700
committerChristopher Ferris <cferris@google.com>2017-08-01 14:30:39 -0700
commitad2a78606b8c3fc85667f26cc46d5f4291badd55 (patch)
tree6c2eb965fa3f929c642eb84c5ed64e8d7dcb59b0
parent5771ac857c7101382c8487d1a73c32bf549b541d (diff)
downloadhwcomposer-ad2a78606b8c3fc85667f26cc46d5f4291badd55.tar.gz
Use frozen copy of ion.h for this code.android-o-mr1-preview-2android-o-mr1-preview-1
Use the ion.h copy in system/core/libion since it's frozen. Test: Builds. Change-Id: Iabbd89691a9ca6b25fde320180b80aba3769b6c7
-rw-r--r--moorefield_hdmi/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/moorefield_hdmi/Android.mk b/moorefield_hdmi/Android.mk
index 8903585..79097bb 100644
--- a/moorefield_hdmi/Android.mk
+++ b/moorefield_hdmi/Android.mk
@@ -96,6 +96,10 @@ LOCAL_C_INCLUDES := \
$(TARGET_OUT_HEADERS)/libttm \
frameworks/native/include/media/openmax
+# Use the frozen version of ion.h.
+LOCAL_C_INCLUDES += \
+ $(TOP)/system/core/libion/kernel-headers \
+
ifeq ($(TARGET_SUPPORT_HDMI_PRIMARY),true)
LOCAL_CFLAGS += -DINTEL_SUPPORT_HDMI_PRIMARY
endif