diff options
| author | Robert Tarasov <tutankhamen@google.com> | 2022-09-19 22:16:35 -0700 |
|---|---|---|
| committer | Robert Tarasov <tutankhamen@google.com> | 2022-09-19 22:16:35 -0700 |
| commit | c5da306e22683067f26724e8e1861cbd4dcc3dc3 (patch) | |
| tree | b529eea7b892848e78a537f2231dcea10bc0200e | |
| parent | 2a86a197241576ef94cb7a420043c4a08a961df7 (diff) | |
| download | cuttlefish-c5da306e22683067f26724e8e1861cbd4dcc3dc3.tar.gz | |
Partial revert of ag/19786106
Pushing trout back to drm hwcomposer
Bug: 246500971
Test: tested with trout_arm64 target on osprey dut
Change-Id: I69b4da0584e71d24447d49c2677e4bbc4c3ce8c0
| -rw-r--r-- | shared/device.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/shared/device.mk b/shared/device.mk index 8bb54c40c..834416371 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -401,8 +401,19 @@ PRODUCT_PACKAGES += \ # # 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 |