From 655322dd89908374dbc6712a5ea83bcfee5c22a4 Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 8 Mar 2024 18:34:12 +0800 Subject: [PATCH] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: I0c2f5b889daed11d37d1877332a5e75108fb5089 Signed-off-by: Nina Chen --- device-cheetah.mk | 11 ++++++----- device-panther.mk | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4741cff..cbe6d20 100644 --- a/device-cheetah.mk +++ b/device-cheetah.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/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers - ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/pantah-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cheetah.mk) diff --git a/device-panther.mk b/device-panther.mk index a6cc2d4..32c612b 100644 --- a/device-panther.mk +++ b/device-panther.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/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers - ifdef RELEASE_GOOGLE_PANTHER_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_PANTHER_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_PANTHER_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/pantah-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-panther.mk)