commit a3b1737137468cec4ee14dfd325f054425578859
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 24 04:58:56 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 24 04:58:56 2022 +0000
tree b529eea7b892848e78a537f2231dcea10bc0200e
parent 31d252875d6e212b856af5f9b43c98b22fe88048
parent c5da306e22683067f26724e8e1861cbd4dcc3dc3

Snap for 9101843 from c5da306e22683067f26724e8e1861cbd4dcc3dc3 to tm-qpr1-release

Change-Id: Ie214e55c86fcac8e6078a3fd95c5e62442d14466

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 8bb54c4..8344163 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -401,8 +401,19 @@
 #
 # Hardware Composer HAL
 #
+# The device needs to avoid having both hwcomposer2.4 and hwcomposer3
+# services running at the same time so make the user manually enables
+# in order to run with --gpu_mode=drm.
+ifeq ($(TARGET_ENABLE_DRMHWCOMPOSER),true)
+DEVICE_MANIFEST_FILE += \
+    device/google/cuttlefish/shared/config/manifest_android.hardware.graphics.composer@2.4-service.xml
+PRODUCT_PACKAGES += \
+    android.hardware.graphics.composer@2.4-service \
+    hwcomposer.drm
+else
 PRODUCT_PACKAGES += \
     android.hardware.graphics.composer3-service.ranchu
+endif
 
 #
 # Gralloc HAL