From dc242dcbda277a18b4bb26e6695b87a3ee21c703 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 18 Apr 2024 16:02:34 +0800 Subject: [PATCH] Switch bootloader directory to control by build flag Bug: 333834221 Change-Id: If900f24f9f171a27f81fed59c4712bf536c84734 --- device-felix.mk | 9 --------- felix/BoardConfig.mk | 12 +++--------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index b829226..10711d0 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -262,15 +262,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so 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 ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk -endif # Set zram size PRODUCT_VENDOR_PROPERTIES += \ diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk index 9ca6580..3b54231 100644 --- a/felix/BoardConfig.mk +++ b/felix/BoardConfig.mk @@ -21,15 +21,9 @@ USES_DEVICE_GOOGLE_FELIX := true BOARD_KERNEL_CMDLINE += swiotlb=noforce RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR)) # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true