Merge "Split bootloader prebuilt to 24Q1 and trunk version" into main

This commit is contained in:
Cyan Hsieh 2023-10-27 03:05:01 +00:00 committed by Android (Google) Code Review
commit 382babc109
2 changed files with 10 additions and 0 deletions

View file

@ -162,6 +162,11 @@ include device/google/tangorpro/fingerprint_config.mk
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/24Q1
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts/trusty/trunk
endif
# Wifi SAP Interface Name # Wifi SAP Interface Name
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

View file

@ -15,6 +15,11 @@
# #
TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := tangorpro TARGET_BOOTLOADER_BOARD_NAME := tangorpro
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif
# Enable load module in parallel # Enable load module in parallel
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true