Merge "qdMetaData: Disable Gralloc4 for non-Android build"
diff --git a/libqdmetadata/Makefile.am b/libqdmetadata/Makefile.am
index 24b1c4a..1fa7e64 100644
--- a/libqdmetadata/Makefile.am
+++ b/libqdmetadata/Makefile.am
@@ -2,6 +2,8 @@
cpp_sources = qdMetaData.cpp
+AM_CPPFLAGS += -D__QTI_NO_GRALLOC4__
+
qdMetaData_includedir = $(pkgincludedir)/display
qdMetaData_include_HEADERS = $(h_sources)
@@ -11,4 +13,4 @@
libqdMetaData_la_CFLAGS = $(AM_CFLAGS) -DLOG_TAG=\"DisplayMetaData\"
libqdMetaData_la_CPPFLAGS = $(AM_CPPFLAGS)
libqdMetaData_LDADD = -lcutils -llog
-libqdMetaData_la_LDFLAGS = -shared -avoid-version
+libqdMetaData_la_LDFLAGS = -shared -avoid-version
\ No newline at end of file
diff --git a/libqdmetadata/qdMetaData.cpp b/libqdmetadata/qdMetaData.cpp
old mode 100644
new mode 100755
index 6c56061..318da5f
--- a/libqdmetadata/qdMetaData.cpp
+++ b/libqdmetadata/qdMetaData.cpp
@@ -32,7 +32,9 @@
#include <QtiGrallocPriv.h>
#include <errno.h>
#include <gralloc_priv.h>
+#ifndef __QTI_NO_GRALLOC4__
#include <gralloctypes/Gralloc4.h>
+#endif
#include <log/log.h>
#include <string.h>
#include <sys/mman.h>
@@ -98,6 +100,7 @@
return 0;
}
+#ifndef __QTI_NO_GRALLOC4__
static bool getGralloc4Array(MetaData_t *metadata, int32_t paramType) {
switch (paramType) {
case SET_VT_TIMESTAMP:
@@ -201,6 +204,15 @@
ALOGE("paramType %d not supported in Gralloc4", paramType);
}
}
+#else
+static bool getGralloc4Array(MetaData_t *metadata, int32_t paramType) {
+ return true;
+}
+
+static void setGralloc4Array(MetaData_t *metadata, int32_t paramType, bool isSet) {
+}
+#endif
+
unsigned long getMetaDataSize() {
return static_cast<unsigned long>(ROUND_UP_PAGESIZE(sizeof(MetaData_t)));