Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." am: 766c348748 am: 4d5f3043a2

am: 57e615605c

Change-Id: I632eccd90114806053b9441a9dc952e09b635f59
This commit is contained in:
Yoshisato Yanagisawa 2016-09-15 03:55:44 +00:00 committed by android-build-merger
commit a25256f715
1 changed files with 3 additions and 1 deletions

View File

@ -49,7 +49,9 @@ ifneq ($(filter-out false,$(USE_GOMA)),)
# gomacc can start goma client's daemon process automatically, but
# it is safer and faster to start up it beforehand. We run this as a
# background process so this won't slow down the build.
$(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
ifndef NOSTART_GOMA
$(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
endif
goma_ctl :=
goma_dir :=