Merge "Add AOSP support for akita" into udc-qpr-dev am: be47537ba1 am: efa86c4c1a

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

Change-Id: Ia66fc18d2b4af0c013fd16d990672ac0e7d782d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-10-24 18:04:50 +00:00 committed by Automerger Merge Worker
commit da6af71781
2 changed files with 2 additions and 0 deletions

View file

@ -32,5 +32,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/akita/proprietary/BoardConfigVendor.mk
include device/google/akita-sepolicy/akita-sepolicy.mk
include device/google/akita/wifi/BoardConfig-wifi.mk

View file

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