Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52cd0d07 authored by David Ng's avatar David Ng Committed by Gerrit - the friendly Code Review server
Browse files

AndroidKernel.mk: Enforce KERNEL_OBJ generation 



Always create the KERNEL_OBJ symlink for legacy reference
support when using the new directory style.  Earlier the
generation relies on another make target that requires it.

Also solve a minor issue where the make @(hide) was incorrectly
used within a shell command.

Change-Id: Ie1b74b6a3eac563ee34865655b046f71411aca65
Signed-off-by: default avatarDavid Ng <dave@codeaurora.org>
parent cfd42c3b

AndroidKernel.mk

+5 −3
Original line number Diff line number Diff line
@@ -113,9 +113,11 @@ fi 
endef



ifneq ($(KERNEL_LEGACY_DIR),true)

$(KERNEL_USR): $(TARGET_PREBUILT_INT_KERNEL)

$(KERNEL_USR): $(KERNEL_HEADERS_INSTALL)

	rm -rf $(KERNEL_SYMLINK)

	ln -s kernel/$(TARGET_KERNEL) $(KERNEL_SYMLINK)



$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_USR)

endif



$(KERNEL_OUT):
@@ -139,12 +141,12 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL) 


$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)

	$(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \

			$(hide) rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \

			rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \

			$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_HEADER_DEFCONFIG); \

			$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) headers_install; fi

	$(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \

			echo "Used a different defconfig for header generation"; \

			$(hide) rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \

			rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \

			$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG); fi

	$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \

			echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \