From edd9532ef36ea08ae2ca4a17adf207eaa1a87874 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 18 Apr 2024 15:26:16 +0800 Subject: [PATCH] Switch bootloader directory to control by build flag Bug: 333834221 Change-Id: I2d8ad5079fcd2b8d76148decb996cab0dd375dfb --- device-oriole.mk | 18 ------------------ device-raven.mk | 18 ------------------ device-slider.mk | 9 --------- device-whitefin.mk | 9 --------- oriole/BoardConfig.mk | 12 +++--------- raven/BoardConfig.mk | 12 +++--------- slider/BoardConfig.mk | 12 +++--------- whitefin/BoardConfig.mk | 12 +++--------- 8 files changed, 12 insertions(+), 90 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 3322afd..4b7480a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -41,15 +41,6 @@ include device/google/gs-common/touch/stm/stm11.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/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) @@ -241,15 +232,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk -endif # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index bf6b772..de04e6c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -41,15 +41,6 @@ include device/google/gs-common/touch/lsi/lsi.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/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) @@ -249,15 +240,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk -endif # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-slider.mk b/device-slider.mk index 299a400..70b52fc 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -106,15 +106,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk -endif # tetheroffload HAL PRODUCT_PACKAGES += \ diff --git a/device-whitefin.mk b/device-whitefin.mk index e360b1f..23805c4 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -89,15 +89,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk -endif # tetheroffload HAL PRODUCT_PACKAGES += \ diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index b961a92..50c2ba7 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -24,15 +24,9 @@ BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_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_ORIOLE_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 8a105ed..6a9530e 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -24,15 +24,9 @@ BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_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_RAVEN_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)) ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 015c854..55a77a0 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -15,15 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider -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_ORIOLE_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 560 USES_DEVICE_GOOGLE_RAVIOLE := true diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index 7163cdd..1bff3de 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -15,15 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin -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_ORIOLE_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 440 USES_DEVICE_GOOGLE_RAVIOLE := true