commit b5ffcba4f46f5041ee61790e589e3437f1fae7b4
author Jason Macnak <natsu@google.com> Wed Oct 06 20:30:37 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 06 20:30:37 2021 +0000
tree b3b3f3ef2b545df0553a2d8ee0b0abbef0f3c172
parent b57327f75f515370646edccc4e4dcfbabe70a900
parent 9856b7763ae2098e9a13f2b36e1ea394357add43

Merge "Upgrade to hwcomposer 2.4" am: 9856b7763a

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1845275

Change-Id: I59adb078b790bf89236a4b5772059cc62ee16c40

64bitonly/product/vendor.mk

diff --git a/64bitonly/product/vendor.mk b/64bitonly/product/vendor.mk
index f90513b..1e98ecf 100644
--- a/64bitonly/product/vendor.mk
+++ b/64bitonly/product/vendor.mk
@@ -45,8 +45,7 @@
     qemu-props \
     stagefright \
     fingerprint.ranchu \
-    android.hardware.graphics.composer@2.3-impl \
-    android.hardware.graphics.composer@2.3-service \
+    android.hardware.graphics.composer@2.4-service \
     android.hardware.graphics.allocator@3.0-service \
     android.hardware.graphics.mapper@3.0-impl-ranchu \
     hwcomposer.ranchu \

fvp.mk

diff --git a/fvp.mk b/fvp.mk
index b980b3a..2500680 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -56,8 +56,7 @@
     android.hardware.gatekeeper@1.0-service.software \
     android.hardware.graphics.allocator@2.0-service \
     android.hardware.graphics.allocator@2.0-impl \
-    android.hardware.graphics.composer@2.3-service \
-    android.hardware.graphics.composer@2.3-impl \
+    android.hardware.graphics.composer@2.4-service \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.health@2.0-service \
     android.hardware.neuralnetworks@1.3-service-sample-all \

vendor.mk

diff --git a/vendor.mk b/vendor.mk
index c2bb5f1..3c4de83 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -45,8 +45,7 @@
     qemu-props \
     stagefright \
     fingerprint.ranchu \
-    android.hardware.graphics.composer@2.3-impl \
-    android.hardware.graphics.composer@2.3-service \
+    android.hardware.graphics.composer@2.4-service \
     android.hardware.graphics.allocator@3.0-service \
     android.hardware.graphics.mapper@3.0-impl-ranchu \
     hwcomposer.ranchu \