From 3232826a885f0a016d4c6fd1a6f0c6f807dbb166 Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 18 Oct 2024 21:45:27 +0800 Subject: [PATCH] Modify TARGET_LINUX_KERNEL_VERSION according to build flags Bug: 374029508 Bug: 357775261 Flag: build.RELEASE_KERNEL_CAIMAN_VERSION Flag: build.RELEASE_KERNEL_KOMODO_VERSION Flag: build.RELEASE_KERNEL_TOKAY_VERSION Change-Id: I0e96ce4cd4ce3768c0fcbb04db8fcd3a28077ae0 --- device-caiman.mk | 6 ++++++ device-komodo.mk | 6 ++++++ device-tokay.mk | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index 8d4372ab..07d660d9 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -26,6 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/32711900 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR) $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)) +ifdef RELEASE_KERNEL_CAIMAN_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CAIMAN_VERSION) +else +TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_CAIMAN_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers diff --git a/device-komodo.mk b/device-komodo.mk index 8173c405..6d575ecf 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -26,6 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/32711900 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR) $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)) +ifdef RELEASE_KERNEL_KOMODO_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_KOMODO_VERSION) +else +TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_KOMODO_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers diff --git a/device-tokay.mk b/device-tokay.mk index 6799ec60..1bd27184 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -26,6 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR) $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)) +ifdef RELEASE_KERNEL_TOKAY_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_TOKAY_VERSION) +else +TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_TOKAY_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers