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

Commit 75b1a394 authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by android-build-merger
Browse files

Merge "Always use ensure_start to ensure goma\'s daemon runs" 

am: f221cbba

* commit 'f221cbba':
  Always use ensure_start to ensure goma's daemon runs

Change-Id: I57af0d64742ddf4585cfcc036f53244e0c2d6226
parents 02b786ce f221cbba

core/goma.mk

+1 −5
Original line number Diff line number Diff line
@@ -46,11 +46,7 @@ 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.

  # We use "ensure_start" command when the compiler_proxy is already

  # running and uses GOMA_HERMETIC=error flag. The compiler_proxy will

  # restart otherwise.

  # TODO(hamaji): Remove this condition after http://b/25676777 is fixed.

  $(shell ( if ( curl http://localhost:$$($(GOMA_CC) port)/flagz | grep GOMA_HERMETIC=error ); then cmd=ensure_start; else cmd=restart; fi; GOMA_HERMETIC=error $(goma_ctl) $${cmd} ) &> /dev/null &)

  $(shell ( GOMA_HERMETIC=error $(goma_ctl) ensure_start ) &> /dev/null &)



  goma_ctl :=

  goma_dir :=