commit 85fbcf4a680d04db703f417f5fc0b3eb06f5c2b7
author Jayant Chowdhary <jchowdhary@google.com> Mon Nov 27 15:01:02 2017 -0800
committer Jayant Chowdhary <jchowdhary@google.com> Tue Nov 28 11:26:24 2017 -0800
tree d249ab21e4e42c390430172ccf37721af8ce43ee
parent dcbc2e9a262130260baf33db8bd53af83ccab206

Export DIST_DIR to soong on dist builds.

Bug: 64267858

Test: Adding DistDir to build/soong/android/variable.go enables access
      to DIST_DIR_SOONG.

Change-Id: I74faea11255edf37db6a4eaf193df300c363bfb7

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 5ebd123..a90e5af 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -119,6 +119,8 @@
 
 $(call add_json_bool, UseGoma,                           $(filter-out false,$(USE_GOMA)))
 
+$(call add_json_str,  DistDir,                           $(if $(dist_goal), $(DIST_DIR)))
+
 _contents := $(subst $(comma)$(newline)__SV_END,$(newline)}$(newline),$(_contents)__SV_END)
 
 $(file >$(SOONG_VARIABLES).tmp,$(_contents))