From 3f1de34bf50647d159fad48473f5834ec9caa79e Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 8 Mar 2024 13:54:23 +0800 Subject: [PATCH] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: I9030340e6dfecd9fe49150afb2e58ad5b0f92f4a Signed-off-by: Nina Chen --- device-bluejay.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index b300bbc..bfb8396 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -17,16 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/bluejay-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/bluejay-kernel/kernel-headers - ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/bluejay-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/bluejay-kernel/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/bluejay/prebuilts/device-vendor-bluejay.mk)