From 8ca4092ab4ab790c7ed25bbfb40d4ce2b5f9d16d Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Sun, 7 Jun 2020 18:16:38 -0700
Subject: [PATCH] Add out/soong/late-${TARGET_PRODUCT}.mk

Read out/soong/late-${TARGET_PRODUCT}.mk after reading Android.mk files
to allow Soong's makevars singleton to use $(call dist-for-goals).

Test: m lint-check dist
Change-Id: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
---
 core/main.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/main.mk b/core/main.mk
index f8179a6757..fec88cdcba 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -506,7 +506,7 @@ FULL_BUILD := true
 # 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