From 688f385dae696b32273d79f7c4fda1c4256f1eb9 Mon Sep 17 00:00:00 2001 From: Aaron Ding Date: Wed, 27 Dec 2023 00:52:46 +0800 Subject: [PATCH] pantah: control the kernel by release configuration Bug: 317784824 Change-Id: Ib7533e29e13b814f1bf8c669f9163b98af45e469 Signed-off-by: Aaron Ding --- device-cheetah.mk | 9 +++++++++ device-panther.mk | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 52f908a..408cbd5 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -20,6 +20,15 @@ $(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 +endif + $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cheetah.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk) diff --git a/device-panther.mk b/device-panther.mk index 0b8a49b..6927d17 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -20,6 +20,15 @@ $(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 +endif + $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-panther.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)