Use frozen copy of ion.h for this code. am: ad2a78606b
am: 627667649b

Change-Id: I15ad57f88c06de3064793cbc4c7b3bc09e04315a
diff --git a/merrifield/ips/common/RotationBufferProvider.cpp b/merrifield/ips/common/RotationBufferProvider.cpp
index 65a4db8..5f90865 100644
--- a/merrifield/ips/common/RotationBufferProvider.cpp
+++ b/merrifield/ips/common/RotationBufferProvider.cpp
@@ -16,6 +16,7 @@
 
 #include <HwcTrace.h>
 #include <common/RotationBufferProvider.h>
+#include <system/graphics-base.h>
 
 namespace android {
 namespace intel {
diff --git a/merrifield/platforms/merrifield/Android.mk b/merrifield/platforms/merrifield/Android.mk
index 9efd7fd..e6eb591 100644
--- a/merrifield/platforms/merrifield/Android.mk
+++ b/merrifield/platforms/merrifield/Android.mk
@@ -23,6 +23,9 @@
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \
                           libwsbm libutils libhardware \
                           libva libva-tpi libva-android libsync
+
+LOCAL_HEADER_LIBRARIES := libsystem_headers
+
 LOCAL_SRC_FILES := \
     ../../common/base/Drm.cpp \
     ../../common/base/HwcLayer.cpp \
diff --git a/merrifield/platforms/merrifield_plus/Android.mk b/merrifield/platforms/merrifield_plus/Android.mk
index dae5335..a0c9893 100644
--- a/merrifield/platforms/merrifield_plus/Android.mk
+++ b/merrifield/platforms/merrifield_plus/Android.mk
@@ -23,6 +23,9 @@
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \
                           libwsbm libutils libhardware \
                           libva libva-tpi libva-android libsync
+
+LOCAL_HEADER_LIBRARIES := libsystem_headers
+
 LOCAL_SRC_FILES := \
     ../../common/base/Drm.cpp \
     ../../common/base/HwcLayer.cpp \
diff --git a/moorefield_hdmi/Android.mk b/moorefield_hdmi/Android.mk
index 79097bb..ab31dc4 100644
--- a/moorefield_hdmi/Android.mk
+++ b/moorefield_hdmi/Android.mk
@@ -32,6 +32,8 @@
                           libwsbm libutils libhardware \
                           libva libva-tpi libva-android libsync
 
+LOCAL_HEADER_LIBRARIES := libsystem_headers
+
 LOCAL_SRC_FILES := \
     common/base/Drm.cpp \
     common/base/HwcLayer.cpp \
diff --git a/moorefield_hdmi/ips/common/RotationBufferProvider.cpp b/moorefield_hdmi/ips/common/RotationBufferProvider.cpp
index 3c23b6b..cc893d0 100644
--- a/moorefield_hdmi/ips/common/RotationBufferProvider.cpp
+++ b/moorefield_hdmi/ips/common/RotationBufferProvider.cpp
@@ -16,6 +16,7 @@
 
 #include <common/utils/HwcTrace.h>
 #include <ips/common/RotationBufferProvider.h>
+#include <system/graphics-base.h>
 
 namespace android {
 namespace intel {