From c203472864831cc079094c4efa11d3f442b70c97 Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 8 Mar 2024 20:02:43 +0800 Subject: [PATCH] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: I95255c3d333aad3ff5dca0ac6ca873b190346571 Signed-off-by: Nina Chen --- device-tangorpro.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index ec4501f..f7d147f 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -14,8 +14,6 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/tangorpro-kernel/kernel-headers TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION @@ -23,8 +21,12 @@ TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TANGORPRO_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/tangorpro-kernel/kernel-headers endif BOARD_WITHOUT_RADIO := true