From 786bbea407f0eb359535f77b770807ebc2a4238e Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Fri, 19 Feb 2021 09:10:58 +0000
Subject: [PATCH] Include android_soong_config_vars.mk in the make (kati) step.

Test: `m nothing` with https://r.android.com/1592872
Bug: 172480615
Change-Id: I960cd234a5dd607f4f5af6bb68ae15b9bd104e7a
---
 core/config.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/config.mk b/core/config.mk
index 3bd362275..6a99a6c7f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1163,8 +1163,11 @@ endif
 dont_bother_goals := out \
     product-graph dump-products
 
-ifeq ($(CALLED_FROM_SETUP),true)
+# Make ANDROID Soong config variables visible to Android.mk files, for
+# consistency with those defined in BoardConfig.mk files.
 include $(BUILD_SYSTEM)/android_soong_config_vars.mk
+
+ifeq ($(CALLED_FROM_SETUP),true)
 include $(BUILD_SYSTEM)/ninja_config.mk
 include $(BUILD_SYSTEM)/soong_config.mk
 endif