From 959382700943fa20630658b3757d70d8e13e0ac6 Mon Sep 17 00:00:00 2001
From: Cosmin Tanislav <demonsingur@gmail.com>
Date: Wed, 8 Sep 2021 20:21:09 +0300
Subject: [PATCH] sm8350-common: build open source display hal libs

---
 BoardConfigCommon.mk                     |  3 --
 common.mk                                | 28 +++++++++++--------
 configs/snapdragon_color_libs_config.xml | 35 ++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 configs/snapdragon_color_libs_config.xml

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 20876fd..03304ee 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -137,7 +137,6 @@ DEVICE_MANIFEST_FILE := \
     $(COMMON_PATH)/manifests/android.hardware.boot@1.1.xml \
     $(COMMON_PATH)/manifests/android.hardware.dumpstate@1.1-service.xiaomi.xml \
     $(COMMON_PATH)/manifests/android.hardware.gnss@2.1-service-qti.xml \
-    $(COMMON_PATH)/manifests/android.hardware.graphics.mapper-impl-qti-display.xml \
     $(COMMON_PATH)/manifests/android.hardware.health@2.1.xml \
     $(COMMON_PATH)/manifests/android.hardware.ir@1.0-service.xml \
     $(COMMON_PATH)/manifests/android.hardware.neuralnetworks@1.3-service-qti.xml \
@@ -156,8 +155,6 @@ DEVICE_MANIFEST_FILE := \
     $(COMMON_PATH)/manifests/power.xml \
     $(COMMON_PATH)/manifests/vendor.qti.diag.hal.service.xml \
     $(COMMON_PATH)/manifests/vendor.qti.gnss@4.0-service.xml \
-    $(COMMON_PATH)/manifests/vendor.qti.hardware.display.allocator-service.xml \
-    $(COMMON_PATH)/manifests/vendor.qti.hardware.display.composer-service.xml \
     $(COMMON_PATH)/manifests/vendor.qti.hardware.servicetracker@1.2-service.xml \
     $(COMMON_PATH)/manifests/vendor.xiaomi.cit.bluetooth@1.0_manifest.xml \
     $(COMMON_PATH)/manifests/vendor.xiaomi.cit.wifi@1.0_manifest.xml \
diff --git a/common.mk b/common.mk
index 2e1a909..a87100f 100644
--- a/common.mk
+++ b/common.mk
@@ -163,21 +163,27 @@ PRODUCT_COPY_FILES += \
 
 # Display
 PRODUCT_PACKAGES += \
-    disable_configstore \
-    gralloc.lahaina \
-    hwcomposer.lahaina \
+    android.hardware.graphics.mapper@3.0-impl-qti-display \
+    android.hardware.graphics.mapper@4.0-impl-qti-display \
+    android.hardware.memtrack@1.0-impl \
+    android.hardware.memtrack@1.0-service \
+    vendor.qti.hardware.display.allocator-service \
+    vendor.qti.hardware.display.composer-service \
+    vendor.qti.hardware.display.mapper@2.0.vendor \
+
+PRODUCT_PACKAGES += \
+    vendor.display.config@1.15.vendor \
+    vendor.display.config@2.0.vendor
+
+PRODUCT_PACKAGES += \
+    gralloc.default \
     libdisplayconfig.qti \
     libqdMetaData \
     libtinyxml \
-    memtrack.lahaina
+    memtrack.default
 
-PRODUCT_PACKAGES += \
-    android.hardware.memtrack@1.0-impl \
-    android.hardware.memtrack@1.0-service \
-    vendor.qti.hardware.display.mapper@2.0.vendor
-#    vendor.qti.hardware.display.allocator-service \
-#    android.hardware.graphics.mapper@3.0-impl-qti-display \
-#    android.hardware.graphics.mapper@4.0-impl-qti-display \
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/snapdragon_color_libs_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/snapdragon_color_libs_config.xml
 
 # DRM
 PRODUCT_PACKAGES += \
diff --git a/configs/snapdragon_color_libs_config.xml b/configs/snapdragon_color_libs_config.xml
new file mode 100644
index 0000000..4dd0095
--- /dev/null
+++ b/configs/snapdragon_color_libs_config.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+Copyright (c) 2020, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<StcLibraries>
+    <Library>
+        <Name>libsnapdragoncolor-qdcm.so</Name>
+        <ProcessingOrder>1</ProcessingOrder>
+    </Library>
+</StcLibraries>