Commit 250cbafa authored Dec 05, 2017 by Ethan Chen Committed by Abhisek Devkota Jan 09, 2018

build: Make systemimage depend on installed kernel if system is root

If the system image is the rootfs, then any potential kernel modules
need to be present on the rootfs if specified with
NEEDS_KERNEL_MODULE_ROOT. Force the dependency to ensure that kernel
module installation occurs before system.img generation.

Change-Id: I5b9175fcbd8ac2884eb23f299c2d79ad20039899

parent d9c8b008

core/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -1397,6 +1397,10 @@ INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \

		FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)

		ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
		FULL_SYSTEMIMAGE_DEPS += $(INSTALLED_KERNEL_TARGET)
		endif

		# ASAN libraries in the system image - add dependency.
		ASAN_IN_SYSTEM_INSTALLED := $(TARGET_OUT)/asan.tar.bz2
		ifneq (,$(SANITIZE_TARGET))