From 295ddaa61d670a77c1f46a5937d22d50114bacb6 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Fri, 6 Sep 2019 10:46:50 +0800 Subject: [PATCH] Fix real file depends on PHONY target Change-Id: Idd42f4575dfd9fbbff9ab15e20e65d932df0390c --- build/tasks/apicheck.mk | 2 +- build/tasks/kernel.mk | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/build/tasks/apicheck.mk b/build/tasks/apicheck.mk index 6b2c85b9..ee6f35cc 100644 --- a/build/tasks/apicheck.mk +++ b/build/tasks/apicheck.mk @@ -38,7 +38,7 @@ checkapi-lineage : check-lineage-public-api # (See lineage-sdk/Android.mk) # we need to add api-stubs as additional dependency of the api check. -$(INTERNAL_LINEAGE_PLATFORM_API_FILE): lineage-api-stubs-docs +$(INTERNAL_LINEAGE_PLATFORM_API_FILE): # Check that the API we're building hasn't broken the last-released # SDK version. diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk index 3ba45a0b..a199eb2f 100644 --- a/build/tasks/kernel.mk +++ b/build/tasks/kernel.mk @@ -211,8 +211,7 @@ define make-dtbo-target $(call internal-make-kernel-target,$(PRODUCT_OUT)/dtbo,$(1)) endef -.PHONY: force_additional_config -$(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config +$(KERNEL_ADDITIONAL_CONFIG_OUT): $(hide) cmp -s $(KERNEL_ADDITIONAL_CONFIG_SRC) $@ || cp $(KERNEL_ADDITIONAL_CONFIG_SRC) $@; $(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT) @@ -232,8 +231,7 @@ $(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT) $(call make-kernel-target,KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig); \ fi -.PHONY: TARGET_KERNEL_BINARIES -TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG) +$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) @echo "Building Kernel" $(call make-kernel-target,$(BOARD_KERNEL_IMAGE_NAME)) $(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \ @@ -258,9 +256,7 @@ INSTALLED_KERNEL_MODULES: depmod-host ($(call build-image-kernel-modules,$$modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR))); \ fi -$(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES - -$(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES) +$(TARGET_KERNEL_MODULES): $(TARGET_PREBUILT_INT_KERNEL) .PHONY: kerneltags kerneltags: $(KERNEL_CONFIG) @@ -306,7 +302,7 @@ INSTALLED_DTBOIMAGE_TARGET := $(PRODUCT_OUT)/dtbo.img ALL_PREBUILT += $(INSTALLED_DTBOIMAGE_TARGET) .PHONY: kernel -kernel: $(INSTALLED_KERNEL_TARGET) +kernel: $(INSTALLED_KERNEL_TARGET) $(TARGET_KERNEL_MODULES) .PHONY: dtboimage dtboimage: $(INSTALLED_DTBOIMAGE_TARGET)