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

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

Merge "Use GOMA_HERMETIC=error for USE_GOMA=true build" am: a50961ae 

am: 13248f93

* commit '13248f93':
  Use GOMA_HERMETIC=error for USE_GOMA=true build
parents 0301a78b 13248f93

core/goma.mk

+5 −1
Original line number Diff line number Diff line
@@ -56,7 +56,11 @@ ifneq ($(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 &)

  # 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 &)



  goma_ctl :=

  goma_dir :=