commit a24bf1c5987acdb4f5803e0a65dd78a90f52394c
author Bharath <bharath@fairphone.com> Fri Oct 07 21:03:38 2022 +0530
committer Karsten Tausche <karsten@fairphone.com> Tue Oct 11 15:54:46 2022 +0200
tree 57454312989e7a2a07c6bd6c2c6c0c07088a84bc
parent 25e24fc9f19caf7d476084882ff2877159019133
parent cef8b5309e2ce60f066d8e708df79ad786477fe5

Merge tag 'LA.UM.10.6.2.r1-02500-89xx.0' into int/13/fp3

"LA.UM.10.6.2.r1-02500-89xx.0"

* tag 'LA.UM.10.6.2.r1-02500-89xx.0':
  display: Add client interface for DisplayConfig APIs

Change-Id: I585e7be2d766b5751fb2ab379e324dacd65072ae

config/display-interfaces-product.mk

diff --git a/config/display-interfaces-product.mk b/config/display-interfaces-product.mk
index cc43526..80ab8db 100644
--- a/config/display-interfaces-product.mk
+++ b/config/display-interfaces-product.mk
@@ -22,9 +22,9 @@
                     vendor.qti.hardware.display.mapper@4.0.vendor \
                     vendor.qti.hardware.display.mapperextensions@1.0.vendor \
                     vendor.qti.hardware.display.mapperextensions@1.1.vendor \
-                    vendor.qti.hardware.display.config-V1-ndk_platform.vendor \
-                    vendor.qti.hardware.display.config-V2-ndk_platform.vendor \
-                    vendor.qti.hardware.display.config-V3-ndk_platform.vendor \
-                    vendor.qti.hardware.display.config-V4-ndk_platform.vendor \
-                    vendor.qti.hardware.display.config-V5-ndk_platform.vendor \
-                    vendor.qti.hardware.display.config-V6-ndk_platform.vendor
+                    vendor.qti.hardware.display.config-V1-ndk.vendor \
+                    vendor.qti.hardware.display.config-V2-ndk.vendor \
+                    vendor.qti.hardware.display.config-V3-ndk.vendor \
+                    vendor.qti.hardware.display.config-V4-ndk.vendor \
+                    vendor.qti.hardware.display.config-V5-ndk.vendor \
+                    vendor.qti.hardware.display.config-V6-ndk.vendor

gralloc/QtiGrallocPriv.h

diff --git a/gralloc/QtiGrallocPriv.h b/gralloc/QtiGrallocPriv.h
index 3c9bbae..896ab22 100644
--- a/gralloc/QtiGrallocPriv.h
+++ b/gralloc/QtiGrallocPriv.h
@@ -76,9 +76,9 @@
 
 #include "QtiGrallocMetadata.h"
 
-#ifndef __QTI_DISPLAY_GRALLOC__
-#pragma message "QtiGrallocPriv.h should not be included"
-#endif
+// #ifndef __QTI_DISPLAY_GRALLOC__
+// #pragma message "QtiGrallocPriv.h should not be included"
+// #endif
 
 /*
  *

gralloc/gralloc_priv.h

diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h
index 2ca0146..aae56f5 100644
--- a/gralloc/gralloc_priv.h
+++ b/gralloc/gralloc_priv.h
@@ -26,7 +26,7 @@
 #include "QtiGrallocDefs.h"
 #include "gr_priv_handle.h"
 
-#pragma message "Warning: gralloc_priv.h is deprecated"
+// #pragma message "Warning: gralloc_priv.h is deprecated"
 
 #define GRALLOC_PROP_PREFIX  "vendor.gralloc."
 #define GRALLOC_PROP(prop_name) GRALLOC_PROP_PREFIX prop_name

libqdmetadata/qdMetaData.h

diff --git a/libqdmetadata/qdMetaData.h b/libqdmetadata/qdMetaData.h
index 7516380..a470523 100644
--- a/libqdmetadata/qdMetaData.h
+++ b/libqdmetadata/qdMetaData.h
@@ -41,9 +41,9 @@
 #include <QtiGrallocPriv.h>
 #endif
 
-#ifndef __QTI_DISPLAY_GRALLOC__
-#pragma message "qdMetaData.h is being deprecated"
-#endif
+// #ifndef __QTI_DISPLAY_GRALLOC__
+// #pragma message "qdMetaData.h is being deprecated"
+// #endif
 
 #ifdef __cplusplus
 extern "C" {