commit bc1051d3997f9908103f7122061167b61793d9ce
author Colin Cross <ccross@android.com> Thu Jun 11 18:36:18 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 11 18:36:18 2020 +0000
tree 5a4760cfe6c4a8dfaecede55cc20b887f992dffa
parent 80ef0a212cbe40ed6d6429474f68ed2f1e59e076
parent 8ca4092ab4ab790c7ed25bbfb40d4ce2b5f9d16d

Merge "Add out/soong/late-${TARGET_PRODUCT}.mk"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index a0aa526..76f915c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -508,7 +508,7 @@
 # Include all of the makefiles in the system
 #
 
-subdir_makefiles := $(SOONG_ANDROID_MK) $(file <$(OUT_DIR)/.module_paths/Android.mk.list)
+subdir_makefiles := $(SOONG_ANDROID_MK) $(file <$(OUT_DIR)/.module_paths/Android.mk.list) $(SOONG_OUT_DIR)/late-$(TARGET_PRODUCT).mk
 subdir_makefiles_total := $(words int $(subdir_makefiles) post finish)
 .KATI_READONLY := subdir_makefiles_total