From 9f7ed821c85defdd815fbe80a293bbe76eb1184e Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:47:02 +0800 Subject: [PATCH] Switch default kernel directory and change build flag naming Bug: 309749142 Change-Id: I1be08e889dfa60d6a24acac7f71f21b0241221b1 --- device-felix.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index 69ec36f..b829226 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -19,18 +19,10 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT -ifdef RELEASE_GOOGLE_FELIX_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_FELIX_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_FELIX_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_FELIX_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_FELIX_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/felix-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/felix-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_FELIX_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_FELIX_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/felix/prebuilts/device-vendor-felix.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)