Merge "Don't use default wallpaper when factory build" into main

This commit is contained in:
John Pan 2024-02-22 05:23:36 +00:00 committed by Android (Google) Code Review
commit 9885b6c176
3 changed files with 12 additions and 3 deletions

View file

@ -28,11 +28,14 @@ endif
$(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-caiman.mk)
$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersCaiman.mk)
$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/caiman/device-vendor-caiman.mk)
$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersCaiman.mk)
endif
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay

View file

@ -28,11 +28,14 @@ endif
$(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-komodo.mk)
$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersKomodo.mk)
$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/komodo/device-vendor-komodo.mk)
$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
ifeq ($(filter factory_komodo, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersKomodo.mk)
endif
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay

View file

@ -19,10 +19,13 @@ TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk)
$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersTokay.mk)
$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/tokay/device-vendor-tokay.mk)
ifeq ($(filter factory_tokay, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/WallpapersTokay.mk)
endif
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay