commit 20f99a60eabe1ae79c90263df85ed5f15f6f9bde
author Dan Willemsen <dwillemsen@google.com> Thu Oct 12 01:35:14 2017 -0700
committer Dan Willemsen <dwillemsen@google.com> Thu Oct 12 15:35:42 2017 -0700
tree ed1ae6a1e8fb0985efdd4c42e96de2973b53bb33
parent dcb1f24e9b85b2c8c64351603a473946ffefd6e3

Use CALLED_FROM_SETUP instead of KATI

So that we can use kati instead of make for the initial config loading.

Test: m clean; m nothing
Test: USE_GOMA=true m nothing
Test: m PRODUCT-aosp_x86-sdk
Test: m APP-Calculator
Test: multiproduct_kati -only-config  (on AOSP and internal master)
Change-Id: I5d3af847607fa48868c2045401977eca37dc6ae1

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index c99c70f..5372336 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -639,7 +639,7 @@
   DIST_DIR := $(OUT_DIR)/dist
 endif
 
-ifndef KATI
+ifeq ($(CALLED_FROM_SETUP),true)
 PRINT_BUILD_CONFIG ?= true
 endif