Merge "Fix Automotive GSI RRO configuration" into main am: bdb6b87837 am: c5d1727048

Original change: https://android-review.googlesource.com/c/platform/build/+/3098638

Change-Id: I952e1761c897f00e1bf380f449917a9a33ff7132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gaurav Sarode 2024-05-24 19:46:31 +00:00 committed by Automerger Merge Worker
commit c20424ed15

View file

@ -50,10 +50,13 @@ PRODUCT_PACKAGES += \
init.gsi.rc \ init.gsi.rc \
init.vndk-nodef.rc \ init.vndk-nodef.rc \
# Overlay the GSI specific SystemUI setting # Overlay the GSI specific SystemUI setting
PRODUCT_PACKAGES += gsi_overlay_systemui ifneq ($(PRODUCT_IS_AUTOMOTIVE),true)
PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += gsi_overlay_systemui
device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml PRODUCT_COPY_FILES += \
device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml
endif
# b/308878144 no more VNDK on 24Q1 and beyond # b/308878144 no more VNDK on 24Q1 and beyond
KEEP_VNDK ?= false KEEP_VNDK ?= false