Commit 85534660 authored Mar 02, 2021 by Treehugger Robot Committed by Automerger Merge Worker Mar 02, 2021

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

Merge "Include android_soong_config_vars.mk in the make (kati) step." am: 36c1435e am: 7e3f5430 am: b46772a7

Original change: https://android-review.googlesource.com/c/platform/build/+/1595337

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I120d96d5ff600e257a7784c195aa2f821622389b

core/config.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -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