Merge branch '219devices-q-prebuilt_kernel' into 'v1-q' (698e8e60) · Commits · e / os / android_vendor_lineage

build/tasks/kernel.mk

+20 −2

Original line number	Diff line number	Diff line
		@@ -61,6 +61,9 @@
		# modules in system instead of vendor
		# NEED_KERNEL_MODULE_VENDOR_OVERLAY = Optional, if true, install kernel
		# modules in vendor_overlay instead of vendor
		#
		# TARGET_FORCE_PREBUILT_KERNEL = Optional, use TARGET_PREBUILT_KERNEL even if
		# kernel sources are present

		ifneq ($(TARGET_NO_KERNEL),true)

		@@ -158,11 +161,26 @@ else
		$(warning * BoardConfig.mk file *)
		$(warning **********************************************************)
		$(error "NO KERNEL CONFIG")
		else
		ifneq ($(TARGET_FORCE_PREBUILT_KERNEL),)
		$(warning **********************************************************)
		$(warning * Kernel source found and configuration was defined, *)
		$(warning * but prebuilt kernel is being forced. *)
		$(warning * While this is likely intentional, *)
		$(warning * it is NOT SUPPORTED WHATSOEVER. *)
		$(warning * Generated kernel headers may not align with *)
		$(warning * the ABI of kernel you're including. *)
		$(warning * Please unset TARGET_FORCE_PREBUILT_KERNEL *)
		$(warning * to build the kernel from source. *)
		$(warning **********************************************************)
		FULL_KERNEL_BUILD := false
		KERNEL_BIN := $(TARGET_PREBUILT_KERNEL)
		else
		FULL_KERNEL_BUILD := true
		KERNEL_BIN := $(TARGET_PREBUILT_INT_KERNEL)
		endif
		endif
		endif

		ifneq ($(TARGET_KERNEL_RECOVERY_CONFIG),)
		ifeq "$(wildcard $(KERNEL_SRC) )" ""

+0 −3

Original line number	Diff line number	Diff line
		@@ -41,9 +41,6 @@ BUILD_TOP := $(shell pwd)

		TARGET_AUTO_KDIR := $(shell echo $(TARGET_DEVICE_DIR) \| sed -e 's/^device/kernel/g')
		TARGET_KERNEL_SOURCE ?= $(TARGET_AUTO_KDIR)
		ifneq ($(TARGET_PREBUILT_KERNEL),)
		TARGET_KERNEL_SOURCE :=
		endif

		TARGET_KERNEL_ARCH := $(strip $(TARGET_KERNEL_ARCH))
		ifeq ($(TARGET_KERNEL_ARCH),)