From 3cc2927e27b1adb26434616c2cb366804c79055d Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 24 Oct 2023 17:51:58 +0800 Subject: [PATCH] Split bootloader prebuilt to 24Q1 and trunk version Bug: 299879102 Change-Id: I6ba0748b82770025f585d79b8d7aba281391e38d --- cheetah/BoardConfig.mk | 6 +++++- cloudripper/BoardConfig.mk | 5 +++++ device-cheetah.mk | 5 +++++ device-cloudripper.mk | 5 +++++ device-panther.mk | 5 +++++ device-ravenclaw.mk | 10 ++++++++++ panther/BoardConfig.mk | 6 +++++- ravenclaw/BoardConfig.mk | 5 +++++ 8 files changed, 45 insertions(+), 2 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 66bf1a4..c5976fc 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -18,7 +18,11 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_CHEETAH_BOOTLOADER_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index e69540e..0c97cee 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,6 +15,11 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true diff --git a/device-cheetah.mk b/device-cheetah.mk index 51057e6..6296386 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -289,6 +289,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk +endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-cloudripper.mk b/device-cloudripper.mk index b3ef294..aa386b3 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -155,6 +155,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk +endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-panther.mk b/device-panther.mk index 0d1d53c..bfdd620 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -273,6 +273,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk +endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 7b56e1a..b05f844 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -145,6 +145,11 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk +endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -161,6 +166,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk +endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index c11cb43..d985330 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -21,7 +21,11 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_PANTHER_BOOTLOADER_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index caa2afc..a724a26 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,6 +15,11 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif TARGET_SCREEN_DENSITY := 560 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true