commit 07551e6c2160b83793249ae8d25ed26928d02278
author Padmanabhan Komanduru <pkomandu@codeaurora.org> Fri May 29 18:42:18 2020 +0530
committer Padmanabhan Komanduru <pkomandu@codeaurora.org> Fri May 29 18:43:52 2020 +0530
tree de0a45e8689c8d7168c6582f508ef83972329942
parent 8e0c0f3fad7a2ffd85c0ccc75585527a4e022f44

Revert "composer: update composer version to 2.4"

This reverts commit b68e853b51eaf3e2023fc34a6f4623cfb6f81860.
Keep composer version as 2.3 until the device manifest
dependencies are sorted.

Change-Id: I0a8b19942723d4dff8a4cfb69413d8a9a51e5fb1

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index e3eda5b..3cb763d 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -5,9 +5,6 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.graphics.composer@2.2-service)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.graphics.composer@2.2-service.rc)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib64/hw/android.hardware.graphics.composer@2.2-impl.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.graphics.composer@2.3-service)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.graphics.composer@2.3-service.rc)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib64/hw/android.hardware.graphics.composer@2.3-impl.so)
 
 
 # Clean old target objs

config/display-product.mk

diff --git a/config/display-product.mk b/config/display-product.mk
index 05c9c07..9366c89 100644
--- a/config/display-product.mk
+++ b/config/display-product.mk
@@ -1,7 +1,7 @@
 # Display product definitions
 PRODUCT_PACKAGES += \
-    android.hardware.graphics.composer@2.4-impl \
-    android.hardware.graphics.composer@2.4-service \
+    android.hardware.graphics.composer@2.3-impl \
+    android.hardware.graphics.composer@2.3-service \
     android.hardware.graphics.mapper@3.0-impl-qti-display \
     android.hardware.graphics.mapper@4.0-impl-qti-display \
     vendor.qti.hardware.display.allocator-service \

config/talos.mk

diff --git a/config/talos.mk b/config/talos.mk
index 3c5bace..93c1cf9 100644
--- a/config/talos.mk
+++ b/config/talos.mk
@@ -1,8 +1,8 @@
 #Display related packages and configuration
 
 PRODUCT_PACKAGES += \
-    android.hardware.graphics.composer@2.4-impl \
-    android.hardware.graphics.composer@2.4-service \
+    android.hardware.graphics.composer@2.3-impl \
+    android.hardware.graphics.composer@2.3-service \
     android.hardware.graphics.mapper@2.0-impl-qti-display \
     vendor.qti.hardware.display.allocator-service \
     android.hardware.memtrack@1.0-impl \

sdm/libs/hwc2/Android.mk

diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index 95c9269..306ff72 100644
--- a/sdm/libs/hwc2/Android.mk
+++ b/sdm/libs/hwc2/Android.mk
@@ -29,7 +29,6 @@
                                  android.hardware.graphics.allocator@3.0 \
                                  android.hardware.graphics.composer@2.2 \
                                  android.hardware.graphics.composer@2.3 \
-                                 android.hardware.graphics.composer@2.4 \
                                  vendor.display.config@1.0 \
                                  vendor.display.config@1.1 \
                                  vendor.display.config@1.2 \