commit 36c1435ec4ac40dc273c916028d7f818f71ae9f3
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 02 09:20:37 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 02 09:20:37 2021 +0000
tree 92aae1f2dc8efa3d28d7960c9a102ec40f09491e
parent 1996d581d812fd3467ab07977b6c650b63d3018c
parent 786bbea407f0eb359535f77b770807ebc2a4238e

Merge "Include android_soong_config_vars.mk in the make (kati) step."

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 3bd3622..6a99a6c 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1163,8 +1163,11 @@
 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