summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaria Yu <aiquny@codeaurora.org>2021-06-21 17:44:47 +0800
committerLijuan Gao <lijuang@codeaurora.org>2021-07-13 18:56:18 +0800
commit71636a456188146f2c71fa0faa3dc1a61ec6968e (patch)
tree538a672873b2cc0c79a09dcab1d691eeacd1dfd8
parent8ef122714216b58e894193aa216ac868d89efa27 (diff)
edk2: Add tools dependency in Androidboot.mk
For ninja build graph need to add build tool files as dependent input into the apps bootloader target. Otherwise, automated dependency generator tool could not detect the dependency of build tools, and therefore removed some project which causes build compilation issues. Change-Id: Iaf1003cd901e727cad093e3e744a2f91c34b8266
-rw-r--r--AndroidBoot.mk18
1 files changed, 17 insertions, 1 deletions
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 9ac6814574..46432d0746 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -144,7 +144,23 @@ $(ABL_OUT):
# Top level target
LOCAL_ABL_PATH := bootable/bootloader/edk2
-LOCAL_ABL_SRC_FILE := $(shell find $(LOCAL_ABL_PATH) -name "*" -type f | sed "s%\.\/%$(LOCAL_ABL_PATH)\/%g")
+LOCAL_ABL_SRC_FILE := \
+ $(wildcard $(LOCAL_ABL_PATH)/*) \
+ $(wildcard $(LOCAL_ABL_PATH)/*/*) \
+ $(wildcard $(LOCAL_ABL_PATH)/*/*/*) \
+ $(wildcard $(LOCAL_ABL_PATH)/*/*/*/*) \
+ $(PREBUILT_PYTHON_PATH) \
+ $(MAKEPATH)make \
+ $(ANDROID_TOP)/$(CLANG) \
+ $(ANDROID_TOP)/$(CLANG_CXX) \
+ $(ANDROID_TOP)/$(HOST_AR) \
+ $(ANDROID_TOP)/$(SOONG_LLVM_PREBUILTS_PATH)/ld.lld \
+ $(wildcard $(CLANG_BIN)/*) \
+ $(wildcard $(CLANG35_GCC_TOOLCHAIN)/*) \
+ $(wildcard $(CLANG35_GCC_TOOLCHAIN)/*/*) \
+ $(wildcard $(CLANG35_GCC_TOOLCHAIN)/*/*/*) \
+ $(wildcard $(CLANG35_GCC_TOOLCHAIN)/*/*/*/*) \
+ $(SECTOOLSV2_BIN)
$(TARGET_ABL): $(LOCAL_ABL_SRC_FILE) | $(ABL_OUT) $(INSTALLED_KEYSTOREIMAGE_TARGET)
$(MAKEPATH)make -C bootable/bootloader/edk2 \
BOOTLOADER_OUT=../../../$(ABL_OUT) \