From 02b6cd4d3831679eaa8526d9571478628ed92cd7 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:52:56 +0800 Subject: [PATCH] Switch default kernel directory and change build flag naming Bug: 309749142 Change-Id: I3af9d15d38631fbaf854a9d13efe96bb42a81b52 --- device-akita.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/device-akita.mk b/device-akita.mk index f957e42..c49b69c 100644 --- a/device-akita.mk +++ b/device-akita.mk @@ -16,17 +16,17 @@ PRODUCT_RELEASE_CONFIG_MAPS += vendor/google_devices/release/phones/release_config_map.mk -ifdef RELEASE_GOOGLE_AKITA_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_AKITA_KERNEL_VERSION) +ifdef RELEASE_KERNEL_AKITA_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_AKITA_VERSION) endif -ifdef RELEASE_GOOGLE_AKITA_KERNEL_DIR +ifdef RELEASE_KERNEL_AKITA_DIR # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_AKITA_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_AKITA_KERNEL_DIR)/kernel-headers +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_AKITA_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_AKITA_DIR)/kernel-headers else -TARGET_KERNEL_DIR ?= device/google/akita-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/akita-kernel/kernel-headers +TARGET_KERNEL_DIR ?= device/google/akita-kernels/5.15/trunk +TARGET_BOARD_KERNEL_HEADERS ?= device/google/akita-kernels/5.15/trunk/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/akita/prebuilts/device-vendor-akita.mk)