diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2021-04-09 18:50:16 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2021-04-09 18:50:16 -0700 |
| commit | f2208b9b3669a7c9f0d21253d6c40c4e4e3b1ba2 (patch) | |
| tree | 504c4c5759ca34196007b878138b46a9836b9f14 | |
| parent | 02489ed1d149c9de169fb280220ede27e990483f (diff) | |
| parent | 16a93690a2d8ddd236afc843f575c0b9c299e492 (diff) | |
Merge 16a93690a2d8ddd236afc843f575c0b9c299e492 on remote branch
Change-Id: I8d3f55a56d092e3bab88b6be50862acfaf5ea648
| -rw-r--r-- | kernel_definitions.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/kernel_definitions.mk b/kernel_definitions.mk index 0faa4ed..08b5f2f 100644 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -111,6 +111,7 @@ BUILD_ROOT_LOC := ../../.. KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/kernel/$(TARGET_KERNEL) KERNEL_SYMLINK := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ KERNEL_USR := $(KERNEL_SYMLINK)/usr +KERNEL_USR_TS := $(TARGET_OUT_INTERMEDIATES)/kernelusr.time KERNEL_CONFIG := $(KERNEL_OUT)/.config @@ -257,9 +258,13 @@ define build-kernel endef # Android Kernel make rules +# Create kernelusr.time file and use its timestamp later to modify the TS of $(KERNEL_USR). \ +# this will ensure in subsequent builds, i.e. no-op incremental builds, modules depends on $(KERNEL_USR) \ +# will not get recompiled. -$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(DTC) $(UFDT_APPLY_OVERLAY) +$(KERNEL_HEADERS_INSTALL): $(DTC) $(UFDT_APPLY_OVERLAY) | $(KERNEL_OUT) $(call build-kernel,$(KERNEL_DEFCONFIG),$(KERNEL_OUT),$(KERNEL_MODULES_OUT),$(KERNEL_HEADERS_INSTALL),1,$(TARGET_PREBUILT_INT_KERNEL)) + touch $(KERNEL_USR_TS) $(KERNEL_OUT): mkdir -p $(KERNEL_OUT) @@ -267,9 +272,11 @@ $(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) +$(KERNEL_USR): | $(KERNEL_HEADERS_INSTALL) + if [ -d "$(KERNEL_SYMLINK)" ] && [ ! -L "$(KERNEL_SYMLINK)" ]; then \ + rm -rf $(KERNEL_SYMLINK); \ + ln -s kernel/$(TARGET_KERNEL) $(KERNEL_SYMLINK); \ + fi $(TARGET_PREBUILT_KERNEL): $(KERNEL_OUT) $(DTC) $(KERNEL_USR) echo "Building the requested kernel.."; \ @@ -284,6 +291,7 @@ $(INSTALLED_KERNEL_TARGET): $(TARGET_PREBUILT_KERNEL) $(GKI_TARGET_PREBUILT_KERN if [ ! -z "$(GKI_TARGET_PREBUILT_KERNEL)" ]; then \ cp $(GKI_TARGET_PREBUILT_KERNEL) $(PRODUCT_OUT)/kernel-gki; \ fi + touch $(KERNEL_USR) -r $(KERNEL_USR_TS) # RTIC DTS to DTB (if MPGen enabled; # and make sure we don't break the build if rtic_mp.dts missing) |