From b3fbb99d1bb2e8876ed5e505f17cb9fce0f25483 Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 8 Mar 2024 18:04:14 +0800 Subject: [PATCH] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: Ie57e73e42b0ad9feab0a7250aac5c83dc3cd2f7c Signed-off-by: Nina Chen --- device-husky.mk | 11 ++++++----- device-shiba.mk | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 26e4bc8..936d594 100644 --- a/device-husky.mk +++ b/device-husky.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/shusky-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers - ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/shusky-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers endif LOCAL_PATH := device/google/shusky diff --git a/device-shiba.mk b/device-shiba.mk index 75730c0..8b5ff63 100644 --- a/device-shiba.mk +++ b/device-shiba.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/shusky-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers - ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/shusky-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers endif LOCAL_PATH := device/google/shusky