diff options
| author | Utkarsh Mittal <utkarshmittal@google.com> | 2022-11-12 14:19:14 +1100 |
|---|---|---|
| committer | Utkarsh Mittal <utkarshmittal@google.com> | 2022-11-17 00:14:20 +0000 |
| commit | 34c2af140a32cd2cebdcbaf9e8b52fa29c495381 (patch) | |
| tree | 188c0dd7ef88e7c3c8123d70c8d89205b488a330 | |
| parent | 2efab681e1b89df58eead9675efdd68003d410b0 (diff) | |
| download | car-34c2af140a32cd2cebdcbaf9e8b52fa29c495381.tar.gz | |
DO NOT MERGE Add multi-display override option to aosp_car_emulator.
This override will be used by the goog3_ev emulator which needs a bigger cluster for resizing purposes. But the override should work for any generic multi-display overriding as well.
Bug: 258523756
Test: lunch gcar_goog3_ev_x86_64-userdebug && m -j && emulator -writable-system
Change-Id: I179c4f67c2e5ca3f1191665a7bb433403e9c2091
| -rw-r--r-- | emulator/aosp_car_emulator.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/emulator/aosp_car_emulator.mk b/emulator/aosp_car_emulator.mk index f0810a9..07f4959 100644 --- a/emulator/aosp_car_emulator.mk +++ b/emulator/aosp_car_emulator.mk @@ -32,9 +32,20 @@ ifeq (true,$(BUILD_EMULATOR_CLUSTER_DISPLAY)) PRODUCT_COPY_FILES += \ device/generic/car/emulator/cluster/display_settings.xml:system/etc/display_settings.xml \ +ifeq ($(EMULATOR_MULTIDISPLAY_HW_CONFIG),) PRODUCT_PRODUCT_PROPERTIES += \ hwservicemanager.external.displays=1,400,600,120,0 \ - persist.service.bootanim.displays=8140900251843329 \ + persist.service.bootanim.displays=8140900251843329 +else +ifneq ($(EMULATOR_MULTIDISPLAY_BOOTANIM_CONFIG),) +$(warning Setting displays to $(EMULATOR_MULTIDISPLAY_HW_CONFIG) and bootanims to $(EMULATOR_MULTIDISPLAY_BOOTANIM_CONFIG)) + PRODUCT_PRODUCT_PROPERTIES += \ + hwservicemanager.external.displays=$(EMULATOR_MULTIDISPLAY_HW_CONFIG) \ + persist.service.bootanim.displays=$(EMULATOR_MULTIDISPLAY_BOOTANIM_CONFIG) +else # EMULATOR_MULTIDISPLAY_BOOTANIM_CONFIG +$(error EMULATOR_MULTIDISPLAY_BOOTANIM_CONFIG has to be defined when EMULATOR_MULTIDISPLAY_BOOTANIM_CONFIG is defined) +endif # EMULATOR_MULTIDISPLAY_BOOTANIM_CONFIG +endif # EMULATOR_HW_MULTIDISPLAY_CONFIG ifeq (true,$(ENABLE_CLUSTER_OS_DOUBLE)) PRODUCT_PACKAGES += CarServiceOverlayEmulatorOsDouble |