Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set."

am: 766c348748

Change-Id: I14edc0203aeadfc85a46bc68fa849c4f3d231b87
This commit is contained in:
Yoshisato Yanagisawa
2016-09-15 03:50:44 +00:00
committed by android-build-merger

View File

@@ -49,7 +49,9 @@ ifneq ($(filter-out false,$(USE_GOMA)),)
# gomacc can start goma client's daemon process automatically, but # 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 # 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. # background process so this won't slow down the build.
ifndef NOSTART_GOMA
$(shell ( $(goma_ctl) ensure_start ) &> /dev/null &) $(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
endif
goma_ctl := goma_ctl :=
goma_dir := goma_dir :=