From c55ff3407c4709e483f39ad95f238bcfe88255d8 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:38:08 +0800 Subject: [PATCH] Switch default kernel directory and change build flag naming Bug: 309749142 Change-Id: If05bbfd7d4b79993fe10c1a206ce78fd3c3e3e5c --- device-oriole.mk | 14 +++----------- device-raven.mk | 14 +++----------- device-slider.mk | 5 +++-- device-whitefin.mk | 5 +++-- 4 files changed, 12 insertions(+), 26 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index bf6a53b..2aa1a9a 100644 --- a/device-oriole.mk +++ b/device-oriole.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_ORIOLE_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) diff --git a/device-raven.mk b/device-raven.mk index e0576c5..5a05f00 100644 --- a/device-raven.mk +++ b/device-raven.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_RAVEN_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RAVEN_DIR)/kernel-headers $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) diff --git a/device-slider.mk b/device-slider.mk index b7ca9e6..6be95eb 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -14,8 +14,9 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) diff --git a/device-whitefin.mk b/device-whitefin.mk index 82c07a8..e618e48 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -14,8 +14,9 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/raviole-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)