From 40affb80c7ff29040e7f82d50d926ab1a0571d1c Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 8 Mar 2024 18:29:57 +0800 Subject: [PATCH] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: I305d2f459d45fbdcd3fb5e26f031ff4931bbbfd9 Signed-off-by: Nina Chen --- device-oriole.mk | 11 ++++++----- device-raven.mk | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 49eecec..3fcbfe1 100644 --- a/device-oriole.mk +++ b/device-oriole.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_ORIOLE_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_ORIOLE_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-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.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)