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
This commit is contained in:
Martin Stjernholm 2021-02-19 09:10:58 +00:00
parent 0a4788c3fb
commit 786bbea407
1 changed files with 4 additions and 1 deletions

View File

@ -1163,8 +1163,11 @@ endif
dont_bother_goals := out \ dont_bother_goals := out \
product-graph dump-products 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 include $(BUILD_SYSTEM)/android_soong_config_vars.mk
ifeq ($(CALLED_FROM_SETUP),true)
include $(BUILD_SYSTEM)/ninja_config.mk include $(BUILD_SYSTEM)/ninja_config.mk
include $(BUILD_SYSTEM)/soong_config.mk include $(BUILD_SYSTEM)/soong_config.mk
endif endif