From c46d8580ef60404a830ac3f46c5190739f76adae Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 22 Sep 2023 17:55:54 +0800 Subject: [PATCH] Enable build flag versioning for radio and bootloader Bug: 299879102 Bug: 301142125 Change-Id: I5c01d3bef0b824a794517b278363b8147976e1af --- husky/BoardConfig.mk | 4 ++++ shiba/BoardConfig.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 76a7ef4..feae954 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -25,6 +25,10 @@ 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_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_HUSKY_BOOTLOADER_DIR) + ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 3ed5c23..3bd73a1 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -25,6 +25,10 @@ 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_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_SHIBA_BOOTLOADER_DIR) + ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else