Merge "Amend the KERNEL_DIR to the prefered name" into 24D1-dev

This commit is contained in:
Treehugger Robot 2024-05-15 15:39:55 +00:00 committed by Android (Google) Code Review
commit 85449d1b90

View file

@ -25,9 +25,9 @@ RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_
$(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)) $(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR))
ifdef RELEASE_GOOGLE_COMET_KERNEL_DIR ifdef RELEASE_KERNEL_COMET_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_COMET_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_COMET_DIR)/kernel-headers
else else
TARGET_KERNEL_DIR ?= device/google/comet-kernels/6.1/24D1 TARGET_KERNEL_DIR ?= device/google/comet-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernels/6.1/24D1/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernels/6.1/24D1/kernel-headers