commit 2be0200a8b5ab399e6d7dc434e19c0ac90f5f787
author Colin Cross <ccross@android.com> Tue Jun 16 03:27:32 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 16 03:27:32 2020 +0000
tree c44724dd4fbd6f8a88eecb16f5cb795c12dc5b28
parent 2e2cb808cb1959b6eb76892bc68f3050f3d92978
parent 3cd4a076bad24832d0f26b70daf440d85a70d97e

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

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index f8b06b9..a6365df 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -426,7 +426,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