Remove code to start Goma compiler_proxy.

Since the code to start compiler proxy is implemented in soong now
(https://android-review.googlesource.com/c/platform/build/soong/+/839293).
We do not need to do that in goma.mk.

Bug: 118390303
Test: After staring goma client, executed followings:
Test: USE_GOMA=true make -j 4
Change-Id: If3da9908483e183f539c0d6ef9dc5826200b0d6b
Signed-off-by: Yoshisato Yanagisawa <yyanagisawa@google.com>
This commit is contained in:
Yoshisato Yanagisawa 2019-01-10 13:58:33 +09:00
parent eeeb9f96c8
commit f07f721235
1 changed files with 1 additions and 13 deletions

View File

@ -17,6 +17,7 @@
# Notice: this works only with Google's Goma build infrastructure.
ifneq ($(filter-out false,$(USE_GOMA)),)
# Goma requires a lot of processes and file descriptors.
# TODO(yyanagisawa): move these code to build/soong/uil/build/goma.go
ifeq ($(shell echo $$(($$(ulimit -u) < 2500 || $$(ulimit -n) < 16000))),1)
$(warning Max user processes and/or open files are insufficient)
ifeq ($(shell uname),Darwin)
@ -31,26 +32,13 @@ ifneq ($(filter-out false,$(USE_GOMA)),)
else
goma_dir := $(HOME)/goma
endif
goma_ctl := $(goma_dir)/goma_ctl.py
GOMA_CC := $(goma_dir)/gomacc
$(if $(wildcard $(goma_ctl)),, \
$(warning You should have goma in $$GOMA_DIR or $(HOME)/goma) \
$(error See go/ma/how-to-use-goma/how-to-use-goma-for-android for detail))
# Append gomacc to existing *_WRAPPER variables so it's possible to
# use both ccache and gomacc.
CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC))
CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC))
JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC))
# 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 :=
endif