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

Commit a25256f7 authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by android-build-merger
Browse files

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

Merge "goma.mk: do not start goma compiler_proxy if NOSTART_GOMA is set." am: 766c3487 am: 4d5f3043
am: 57e61560

Change-Id: I632eccd90114806053b9441a9dc952e09b635f59
parents e88bd41f 57e61560
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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.
  ifndef NOSTART_GOMA
    $(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
  endif

  goma_ctl :=
  goma_dir :=