From c36d7a7972b65d637c084d7051de92c1cd4aecd7 Mon Sep 17 00:00:00 2001 From: Pindar Yang Date: Mon, 26 Aug 2024 05:54:06 +0000 Subject: [PATCH] Switch bootloader and radio directory to control by build flag Flag: build.RELEASE_GOOGLE_PRODUCT_RADIO_DIR, build.RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR, build.RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR Bug: 361226755 Change-Id: I093090da431f7a8daa15fffbd5ffe372ef2c8fa4 Signed-off-by: Pindar Yang --- device-husky.mk | 11 +++++++++++ device-ripcurrent.mk | 5 +++++ device-shiba.mk | 11 +++++++++++ husky/BoardConfig.mk | 6 ------ ripcurrent/BoardConfig.mk | 4 ---- shiba/BoardConfig.mk | 6 ------ 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 706f3e0..3954b89 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -17,6 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_HUSKY_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR) diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index a399216..9d81cf0 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -17,6 +17,11 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RIPCURRENT_VERSION) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RIPCURRENT_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)/kernel-headers diff --git a/device-shiba.mk b/device-shiba.mk index e052cd4..276a933 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -17,6 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_SHIBA_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 76c6b79..63ef483 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -26,12 +26,6 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := husky -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR) -$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)) - ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index 76f2b5d..a84d4b0 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -27,10 +27,6 @@ TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_SHUSKY := true -RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR) -$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)) - include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 8a5fb4b..30d204e 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -26,12 +26,6 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := shiba -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR) -$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)) - ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else