Evolution-X-Tensor/device_google_akita
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Branch bootloader prebuilts for 24Q2 release" into main

Browse source
This commit is contained in:
Cyan Hsieh 2023-12-14 08:44:33 +00:00 • committed by Android (Google) Code Review
commit 62c31c283f
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akita/BoardConfig.mk
View file

@ -26,6 +26,8 @@ TARGET_BOARD_INFO_FILE := device/google/akita/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := akita TARGET_BOOTLOADER_BOARD_NAME := akita
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif endif

4
device-akita.mk
View file

@ -286,6 +286,8 @@ PRODUCT_PACKAGES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/24Q1 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/24Q2
else else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/trunk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/trusty/trunk
endif endif
@ -306,6 +308,8 @@ PRODUCT_VENDOR_PROPERTIES += \
GOODIX_CONFIG_BUILD_VERSION := g7_trusty GOODIX_CONFIG_BUILD_VERSION := g7_trusty
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/24Q1 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/24Q2
else else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/trunk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts/firmware/fingerprint/trunk
endif endif