From eda8074af288751f494dd9c47498f2fcdd8a5e79 Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 8 Mar 2024 19:59:39 +0800 Subject: [PATCH] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: I6e93b76380f4a71b28009319d914f325d04d8796 Signed-off-by: Nina Chen --- device-felix.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index d09faf6..b1e603c 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -17,8 +17,6 @@ # 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/felix-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/felix-kernel/kernel-headers TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT ifdef RELEASE_GOOGLE_FELIX_KERNEL_VERSION @@ -26,8 +24,12 @@ TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_FELIX_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_FELIX_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_FELIX_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_FELIX_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/felix-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/felix-kernel/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/felix/prebuilts/device-vendor-felix.mk)