From 4ec979e7986ebbe0015679f15859d8f5d9c04c5a Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:42:14 +0800 Subject: [PATCH] Switch default kernel directory and change build flag naming Bug: 309749142 Change-Id: I43eef055d8ff15ae71f1dcb8e78385378234a6ac --- device-bluejay.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index a6c723d..62d130d 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -17,18 +17,10 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_BLUEJAY_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/bluejay-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/bluejay-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_BLUEJAY_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_BLUEJAY_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/bluejay/prebuilts/device-vendor-bluejay.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)