commit 40affb80c7ff29040e7f82d50d926ab1a0571d1c
author Nina Chen <sheaunic@google.com> Fri Mar 08 18:29:57 2024 +0800
committer Nina Chen <sheaunic@google.com> Mon Mar 18 03:47:30 2024 +0000
tree d48d7ed06c9a27a8532c5373a9038b3b0432c0a0
parent a5d57c7d7c7ce19e77d9e958547f76de47a62237

Change the rule to specify kernel directory with release configurations

Bug: 326879772
Change-Id: I305d2f459d45fbdcd3fb5e26f031ff4931bbbfd9
Signed-off-by: Nina Chen <sheaunic@google.com>

device-raven.mk

diff --git a/device-raven.mk b/device-raven.mk
index 1e47e91..7503576 100644
--- a/device-raven.mk
+++ b/device-raven.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/raviole-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
-
 ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION)
 endif
 
 ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers
 endif
 
 $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk)