Fix a race in BOOTIMG_FIT Makefile am: 351e677636

am: b3d9b039ff

Change-Id: Ic98db501c8b4e2d13c297b1e6d4528dc3aa7cf8c

1 files changed, 8 insertions, 3 deletions

diff --git a/boot_fit/Android.mk b/boot_fit/Android.mk
index 2cf6ef0..c16ccfe 100644
--- a/boot_fit/Android.mk
+++ b/boot_fit/Android.mk
@@ -6,17 +6,22 @@ DTC := $(HOST_OUT_EXECUTABLES)/dtc
 BOARD_DIR := device/ti/beagle_x15
 ITS := beagle_x15.its
 BOOTIMG_FIT := $(PRODUCT_OUT)/boot_fit.img
+BOOTIMG_FIT_INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
+BOOTIMG_FIT_INSTALLED_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img
 
 $(BOOTIMG_FIT): PRIVATE_DTC_FLAGS_MKIMAGE = -I dts -O dtb -p 500 -Wno-unit_address_vs_reg
 $(BOOTIMG_FIT): PRIVATE_INTERMEDIATES := $(call intermediates-dir-for,PACKAGING,fit)
 $(BOOTIMG_FIT): PRIVATE_ITS := $(ITS)
 $(BOOTIMG_FIT): PRIVATE_MKIMAGE := $(MKIMAGE)
 $(BOOTIMG_FIT): PRIVATE_BOARD_DIR := $(BOARD_DIR)
-$(BOOTIMG_FIT): $(INSTALLED_KERNEL_TARGET) $(INSTALLED_RAMDISK_TARGET) $(BOARD_DIR)/$(ITS) $(MKIMAGE) $(DTC) $(wildcard $(LOCAL_KERNEL)/*.dtb)
+$(BOOTIMG_FIT): PRIVATE_INSTALLED_KERNEL_TARGET := $(BOOTIMG_FIT_INSTALLED_KERNEL_TARGET)
+$(BOOTIMG_FIT): PRIVATE_INSTALLED_RAMDISK_TARGET := $(BOOTIMG_FIT_INSTALLED_RAMDISK_TARGET)
+$(BOOTIMG_FIT): $(BOOTIMG_FIT_INSTALLED_KERNEL_TARGET) $(BOOTIMG_FIT_INSTALLED_RAMDISK_TARGET)
+$(BOOTIMG_FIT): $(BOARD_DIR)/$(ITS) $(MKIMAGE) $(DTC) $(wildcard $(LOCAL_KERNEL)/*.dtb)
         mkdir -p $(PRIVATE_INTERMEDIATES)
         cp $(PRIVATE_BOARD_DIR)/$(PRIVATE_ITS) $(PRIVATE_INTERMEDIATES)/
-        cp $(INSTALLED_RAMDISK_TARGET) $(PRIVATE_INTERMEDIATES)/
-        cp $(INSTALLED_KERNEL_TARGET) $(PRIVATE_INTERMEDIATES)/zImage
+        cp $(PRIVATE_INSTALLED_RAMDISK_TARGET) $(PRIVATE_INTERMEDIATES)/
+        cp $(PRIVATE_INSTALLED_KERNEL_TARGET) $(PRIVATE_INTERMEDIATES)/zImage
         cp $(LOCAL_KERNEL)/*.dtb $(PRIVATE_INTERMEDIATES)/
         PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(PRIVATE_MKIMAGE) -D "$(PRIVATE_DTC_FLAGS_MKIMAGE)" -f $(PRIVATE_INTERMEDIATES)/$(PRIVATE_ITS) $@