From 07f8628d8cecc3a4345d2a9f9bb79cc8d9d07d60 Mon Sep 17 00:00:00 2001 From: Aaron Ding Date: Wed, 27 Dec 2023 00:59:31 +0800 Subject: [PATCH] shusky: control the kernel by release configuration Bug: 317784824 Change-Id: I20edf043647311bd6bafd9720fa5074ae2f5da04 Signed-off-by: Aaron Ding --- device-husky.mk | 9 +++++++++ device-ripcurrent.mk | 9 +++++++++ device-shiba.mk | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index f4e2f00..986b972 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -20,6 +20,15 @@ $(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 +endif + LOCAL_PATH := device/google/shusky ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 0d14aad..86df2e9 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -20,6 +20,15 @@ $(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_RIPCURRENT_KERNEL_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION) +endif + +ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR +TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers +endif + ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) USE_UWBFIELDTESTQM := true endif diff --git a/device-shiba.mk b/device-shiba.mk index 83147ac..21cb10f 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -20,6 +20,15 @@ $(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 +endif + LOCAL_PATH := device/google/shusky $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)