diff options
| author | Marcell Kovacs <marcellk@google.com> | 2022-10-05 19:01:35 +0000 |
|---|---|---|
| committer | Marcell Kovacs <marcellk@google.com> | 2022-10-27 09:44:08 -0700 |
| commit | f8a19130a6ecf2e9444324807b2da7799a9ce765 (patch) | |
| tree | 5bc1873029d3ee3c5dbfb8c2446eb60b0caafdb8 /emulator/aosp_car_emulator.mk | |
| parent | 1f2ae09e33efac76b6582b4846a69b7dcb3863fa (diff) | |
| download | car-f8a19130a6ecf2e9444324807b2da7799a9ce765.tar.gz | |
Make dynamic multi-display generally available on car emulators
This reverts commit 86bc76d1eae988114cca3ebbc3c55e660bc9fd78 that
reverted the original version of this with slight modifications.
This will not enable the dynamic display setup for all emulator targets,
but it can be enabled by using the EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG
flag.
Bug: 239965306
Bug: 245585515
Test: Build gcar_emu_x86_64, gsi_car_arm64
Change-Id: Ib4fc0c1de2f2547ddf82a704984e33d8af8d5041
Diffstat (limited to 'emulator/aosp_car_emulator.mk')
| -rw-r--r-- | emulator/aosp_car_emulator.mk | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/emulator/aosp_car_emulator.mk b/emulator/aosp_car_emulator.mk index b510217..155c5b7 100644 --- a/emulator/aosp_car_emulator.mk +++ b/emulator/aosp_car_emulator.mk @@ -45,20 +45,15 @@ CUSTOMIZE_EVS_SERVICE_PARAMETER := true endif # ENABLE_MOCK_EVSHAL $(call inherit-product, device/generic/car/emulator/evs/evs.mk) +ifeq ($(EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG),true) +# This section configures multi-display without hardcoding the +# displays on hwservicemanager. +$(call inherit-product, device/generic/car/emulator/multi-display-emulator/multidisplay-emulator.mk) +else # EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG ifeq (true,$(BUILD_EMULATOR_CLUSTER_DISPLAY)) -PRODUCT_COPY_FILES += \ - device/generic/car/emulator/cluster/display_settings.xml:system/etc/display_settings.xml \ - -PRODUCT_PRODUCT_PROPERTIES += \ - hwservicemanager.external.displays=1,400,600,120,0 \ - persist.service.bootanim.displays=8140900251843329 \ - -ifeq (true,$(ENABLE_CLUSTER_OS_DOUBLE)) -PRODUCT_PACKAGES += CarServiceOverlayEmulatorOsDouble -else -PRODUCT_PACKAGES += CarServiceOverlayEmulator -endif # ENABLE_CLUSTER_OS_DOUBLE -endif # BUILD_EMULATOR_CLUSTER_DISPLAY +$(call inherit-product, device/generic/car/emulator/cluster/cluster-hwservicemanager.mk) +endif # BUILD_EMULATOR_CLUSTER_DISPLAY +endif # EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG PRODUCT_PRODUCT_PROPERTIES += \ ro.carwatchdog.vhal_healthcheck.interval=10 \ |