diff options
| author | Marcell Kovacs <marcellk@google.com> | 2022-08-18 14:37:49 -0700 |
|---|---|---|
| committer | Marcell Kovacs <marcellk@google.com> | 2022-09-06 09:33:03 -0700 |
| commit | f2f57b3a3e8bb9c6d4a76948148661274ececfe7 (patch) | |
| tree | 0ee29c7c39160ef8f2b63bc9a2f57b9b7325e118 /emulator/aosp_car_emulator.mk | |
| parent | 0f80c71bac6f62f8ac29cf92bef613d276fd226c (diff) | |
| download | car-f2f57b3a3e8bb9c6d4a76948148661274ececfe7.tar.gz | |
Make dynamic multi-display generally available on car emulators
Adds CarServiceMultiDisplayOverlayEmulator package and uses it the AOSP
base target and car_ui_portrait.
BYPASS_INCLUSIVE_LANGUAGE_REASON=referencing existing constants
Bug: 239965306
Test: Build&run many targets
Change-Id: Ia0160bb8c64e7f86c4496006bafbe58fde043308
Diffstat (limited to 'emulator/aosp_car_emulator.mk')
| -rw-r--r-- | emulator/aosp_car_emulator.mk | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/emulator/aosp_car_emulator.mk b/emulator/aosp_car_emulator.mk index f0810a9..1915248 100644 --- a/emulator/aosp_car_emulator.mk +++ b/emulator/aosp_car_emulator.mk @@ -28,20 +28,11 @@ $(call inherit-product, device/generic/car/emulator/rotary/car_rotary.mk) # Enables USB related passthrough $(call inherit-product, device/generic/car/emulator/usbpt/car_usbpt.mk) -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 +# This section configures multi-display without hardcoding the +# displays on hwservicemanager. +ifneq ($(EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG),false) +$(call inherit-product, device/generic/car/emulator/multi-display-emulator/multidisplay-dynamic.mk) +endif # EMULATOR_DYNAMIC_MULTIDISPLAY_CONFIG PRODUCT_PRODUCT_PROPERTIES += \ ro.carwatchdog.vhal_healthcheck.interval=10 \ |