Add AOSP support for Husky and Shiba. am: 062ebe5313

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

Change-Id: Ie02e6562141ba5b87c2368c4d6b1db7826f6bb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Yi 2023-04-20 21:43:01 +00:00 committed by Automerger Merge Worker
commit 4d68fc5079
4 changed files with 4 additions and 0 deletions

View file

@ -28,6 +28,7 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-
$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/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/husky/device-vendor-husky.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)
# display

View file

@ -24,6 +24,7 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-
$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/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/shiba/proprietary/device-vendor.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay

View file

@ -24,5 +24,6 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/zuma/BoardConfig-common.mk
-include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk
include device/google/shusky-sepolicy/husky-sepolicy.mk
include device/google/shusky/wifi/BoardConfig-wifi.mk

View file

@ -24,5 +24,6 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/zuma/BoardConfig-common.mk
-include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk
include device/google/shusky-sepolicy/shiba-sepolicy.mk
include device/google/shusky/wifi/BoardConfig-wifi.mk