tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Export DIST_DIR to soong on dist builds.

Browse source 
Bug: 64267858

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

Change-Id: I74faea11255edf37db6a4eaf193df300c363bfb7
This commit is contained in:
Jayant Chowdhary 2017-11-27 15:01:02 -08:00
parent dcbc2e9a26
commit 85fbcf4a68
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/config.mk
View file

@ -67,6 +67,9 @@ FORCE:
ORIGINAL_MAKECMDGOALS := $(MAKECMDGOALS) 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 # Tell python not to spam the source tree with .pyc files. This
# only has an effect on python 2.6 and above. # only has an effect on python 2.6 and above.
export PYTHONDONTWRITEBYTECODE := 1 export PYTHONDONTWRITEBYTECODE := 1

3
core/distdir.mk
View file

@ -17,9 +17,6 @@
# When specifying "dist", the user has asked that we copy the important # When specifying "dist", the user has asked that we copy the important
# files from this build into DIST_DIR. # files from this build into DIST_DIR.
dist_goal := $(strip $(filter dist,$(MAKECMDGOALS)))
MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))
ifdef dist_goal ifdef dist_goal
# $(1): source file # $(1): source file

2
core/soong_config.mk
View file

@ -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_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) _contents := $(subst $(comma)$(newline)__SV_END,$(newline)}$(newline),$(_contents)__SV_END)
$(file >$(SOONG_VARIABLES).tmp,$(_contents)) $(file >$(SOONG_VARIABLES).tmp,$(_contents))