Change the rule to specify kernel directory with release configurations

Bug: 326879772
Change-Id: I305d2f459d45fbdcd3fb5e26f031ff4931bbbfd9
Signed-off-by: Nina Chen <sheaunic@google.com>
This commit is contained in:
Nina Chen 2024-03-08 18:29:57 +08:00
parent a5d57c7d7c
commit 40affb80c7
2 changed files with 12 additions and 10 deletions

View file

@ -17,16 +17,17 @@
# Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers
# 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
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)

View file

@ -17,16 +17,17 @@
# Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
# 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
$(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk)