From 926ef4120ccd0a4fbb9c9c10c58de35e3bc26db5 Mon Sep 17 00:00:00 2001 From: Aaron Ding Date: Wed, 27 Dec 2023 00:58:22 +0800 Subject: [PATCH] raviole: control the kernel by release configuration Bug: 317784824 Change-Id: I4aec167fcec9e04590b18fa2bb64a42934b041aa Signed-off-by: Aaron Ding --- device-oriole.mk | 9 +++++++++ device-raven.mk | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index edac624..7218b2b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -20,6 +20,15 @@ $(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 +endif + $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) diff --git a/device-raven.mk b/device-raven.mk index 1850ba1..44853db 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -20,6 +20,15 @@ $(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 +endif + $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)