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

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

Browse source
This commit is contained in:
Cyan Hsieh 2023-10-27 03:04:52 +00:00 • committed by Android (Google) Code Review
commit 684f06aee3
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
device-felix.mk
View file

@ -255,6 +255,11 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk
endif
# Set zram size # Set zram size
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \

6
felix/BoardConfig.mk
View file

@ -21,7 +21,11 @@ USES_DEVICE_GOOGLE_FELIX := true
BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_KERNEL_CMDLINE += swiotlb=noforce
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR)
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_FELIX_BOOTLOADER_DIR) 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