Merge "Change the rule to specify kernel directory with release configurations" into main
This commit is contained in:
commit
611b4d69f1
1 changed files with 6 additions and 4 deletions
|
@ -17,8 +17,6 @@
|
|||
# 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/felix-kernel
|
||||
TARGET_BOARD_KERNEL_HEADERS := device/google/felix-kernel/kernel-headers
|
||||
TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT
|
||||
|
||||
ifdef RELEASE_GOOGLE_FELIX_KERNEL_VERSION
|
||||
|
@ -26,8 +24,12 @@ TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_FELIX_KERNEL_VERSION)
|
|||
endif
|
||||
|
||||
ifdef RELEASE_GOOGLE_FELIX_KERNEL_DIR
|
||||
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)
|
||||
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)/kernel-headers
|
||||
# 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
|
||||
|
||||
$(call inherit-product-if-exists, vendor/google_devices/felix/prebuilts/device-vendor-felix.mk)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue