Merge "Add AOSP support for caiman/komodo/tokay" into main

This commit is contained in:
Bill Yi 2024-02-28 19:58:31 +00:00 committed by Android (Google) Code Review
commit c90f92067a
6 changed files with 6 additions and 0 deletions

View file

@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk
include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/caiman/proprietary/BoardConfigVendor.mk
include device/google/caimito-sepolicy/caiman-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk

View file

@ -29,6 +29,7 @@ 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/zumapro/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/caiman/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)

View file

@ -29,6 +29,7 @@ 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/zumapro/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/komodo/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)

View file

@ -20,6 +20,7 @@ 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/zumapro/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/tokay/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)),)

View file

@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk
include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/komodo/proprietary/BoardConfigVendor.mk
include device/google/caimito-sepolicy/komodo-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk

View file

@ -24,5 +24,6 @@ include device/google/caimito/device-caimito-common.mk
include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/tokay/proprietary/BoardConfigVendor.mk
include device/google/caimito-sepolicy/tokay-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk