From cd6bd058730327608c833e8ca5b941c99981b73c Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Mon, 4 Mar 2024 20:08:17 +0800 Subject: [PATCH] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: I1e377eb309ccae7c864d21a7b829216288a2c617 --- device-akita.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/device-akita.mk b/device-akita.mk index 4eb1f0e..7145318 100644 --- a/device-akita.mk +++ b/device-akita.mk @@ -16,16 +16,17 @@ PRODUCT_RELEASE_CONFIG_MAPS += vendor/google_devices/release/phones/release_config_map.mk -TARGET_KERNEL_DIR ?= device/google/akita-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/akita-kernel/kernel-headers - ifdef RELEASE_GOOGLE_AKITA_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_AKITA_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_AKITA_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_AKITA_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_AKITA_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/akita-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/akita-kernel/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/akita/prebuilts/device-vendor-akita.mk)