Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85fbcf4a authored by Jayant Chowdhary's avatar Jayant Chowdhary
Browse files

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
parent dcbc2e9a

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ FORCE: 


ORIGINAL_MAKECMDGOALS := $(MAKECMDGOALS)



dist_goal := $(strip $(filter dist,$(MAKECMDGOALS)))

MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))



# Tell python not to spam the source tree with .pyc files.  This

# only has an effect on python 2.6 and above.

export PYTHONDONTWRITEBYTECODE := 1

core/distdir.mk

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
# When specifying "dist", the user has asked that we copy the important

# files from this build into DIST_DIR.



dist_goal := $(strip $(filter dist,$(MAKECMDGOALS)))

MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))



ifdef dist_goal



# $(1): source file

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ $(call add_json_bool, MinimizeJavaDebugInfo, $(filter true,$(PRODUCT 


$(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))