Merge "Modify TARGET_LINUX_KERNEL_VERSION according to build flags" into main

This commit is contained in:
Treehugger Robot 2024-10-24 05:36:20 +00:00 committed by Android (Google) Code Review
commit 2f7564b8c4
3 changed files with 18 additions and 0 deletions

View file

@ -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

View file

@ -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

View file

@ -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