Stop passing DIST_DIR to Soong
Test: m dist
Change-Id: I812606595703299f5e333d4e62bc1abeaad15c05
diff --git a/core/config.mk b/core/config.mk
index fae53bb..0e4e1fb 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -26,7 +26,7 @@
# as readonly
.KATI_READONLY := OUT_DIR TMPDIR BUILD_DATETIME_FILE
ifdef CALLED_FROM_SETUP
- .KATI_READONLY := CALLED_FROM_SETUP DIST_DIR
+ .KATI_READONLY := CALLED_FROM_SETUP
endif
ifdef KATI_PACKAGE_MK_DIR
.KATI_READONLY := KATI_PACKAGE_MK_DIR
@@ -89,26 +89,19 @@
TARGET_NDK_GCC_VERSION 2ND_TARGET_NDK_GCC_VERSION \
GLOBAL_CFLAGS_NO_OVERRIDE GLOBAL_CPPFLAGS_NO_OVERRIDE \
,GCC support has been removed. Use Clang instead)
+$(KATI_obsolete_var DIST_DIR dist_goal,Use dist-for-goals instead. See $(CHANGES_URL)#dist)
# This is marked as obsolete in envsetup.mk after reading the BoardConfig.mk
$(KATI_deprecate_export It is a global setting. See $(CHANGES_URL)#export_keyword)
+CHANGES_URL :=
+
# Used to force goals to build. Only use for conditionally defined goals.
.PHONY: FORCE
FORCE:
ORIGINAL_MAKECMDGOALS := $(MAKECMDGOALS)
-ifdef CALLED_FROM_SETUP
- dist_goal := $(strip $(filter dist,$(MAKECMDGOALS)))
- MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))
- .KATI_READONLY := dist_goal
-else
- $(KATI_obsolete_var DIST_DIR dist_goal,Use dist-for-goals instead. See $(CHANGES_URL)#dist)
-endif
-
-CHANGES_URL :=
-
UNAME := $(shell uname -sm)
SRC_TARGET_DIR := $(TOPDIR)build/target