summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaghavendra Rao Ananta <rananta@codeaurora.org>2020-08-10 20:35:38 -0700
committerRaghavendra Rao Ananta <rananta@codeaurora.org>2020-08-10 20:35:38 -0700
commit0440fc6971947e9aad13c4f75d5269f750f28d4c (patch)
treede40a9bd1a6b8045bb8cd95279d1421b57c6daab
parent719d841780dcb48631fbf2b9e56b3d5f2e5e88e5 (diff)
kernel_definitions: Force GKI kernel to be built
The build system doesn't seem to trigger the target to build the GKI kernel, thus leading to inconsistent builds. Hence, add a make target dependency on creating a GKI_OUT directory to force building GKI kernel. Change-Id: I58a3c3901de5bc6c67e02d9fc2cfb023b5b43e44 Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
-rw-r--r--kernel_definitions.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel_definitions.mk b/kernel_definitions.mk
index 0be7e06..b0e14ab 100644
--- a/kernel_definitions.mk
+++ b/kernel_definitions.mk
@@ -263,6 +263,9 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(DTC) $(UFDT_APPLY_OVERLAY)
$(KERNEL_OUT):
mkdir -p $(KERNEL_OUT)
+$(GKI_KERNEL_OUT):
+ mkdir -p $(GKI_KERNEL_OUT)
+
$(KERNEL_USR): $(KERNEL_HEADERS_INSTALL)
rm -rf $(KERNEL_SYMLINK)
ln -s kernel/$(TARGET_KERNEL) $(KERNEL_SYMLINK)
@@ -271,7 +274,7 @@ $(TARGET_PREBUILT_KERNEL): $(KERNEL_OUT) $(DTC) $(KERNEL_USR)
echo "Building the requested kernel.."; \
$(call build-kernel,$(KERNEL_DEFCONFIG),$(KERNEL_OUT),$(KERNEL_MODULES_OUT),$(KERNEL_HEADERS_INSTALL),0,$(TARGET_PREBUILT_INT_KERNEL))
-$(GKI_TARGET_PREBUILT_KERNEL): $(DTC) $(UFDT_APPLY_OVERLAY)
+$(GKI_TARGET_PREBUILT_KERNEL): $(DTC) $(UFDT_APPLY_OVERLAY) $(GKI_KERNEL_OUT)
echo "Building GKI kernel.."; \
$(call build-kernel,$(GKI_KERNEL_DEFCONFIG),$(GKI_KERNEL_OUT),$(GKI_KERNEL_MODULES_OUT),$(GKI_KERNEL_HEADERS_INSTALL),0,$(GKI_TARGET_PREBUILT_INT_KERNEL))