Merge "Build HK3/SB3 default CMF color wallpaper" into udc-d1-dev am: d73522bb72

Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/23401212

Change-Id: I6e37babc75c31fc8495dc534eb5aeb258084128a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
John Pan 2023-05-26 07:50:29 +00:00 committed by Automerger Merge Worker
commit d3892c7ce2
2 changed files with 2 additions and 0 deletions

View file

@ -27,6 +27,7 @@ $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-
$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/husky/device-vendor-husky.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/husky/device-vendor-husky.mk)
$(call inherit-product-if-exists, vendor/google_devices/husky/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/husky/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersHusky.mk)
# display # display
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/husky/overlay DEVICE_PACKAGE_OVERLAYS += device/google/shusky/husky/overlay

View file

@ -22,6 +22,7 @@ $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-ve
$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/shiba/device-vendor-shiba.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/shiba/device-vendor-shiba.mk)
$(call inherit-product-if-exists, vendor/google_devices/shiba/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/shiba/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersShiba.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay