p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Remove code to start Goma compiler_proxy." 

am: 1951e70416

Change-Id: Id338cd7771ad17964b8c4a4b209ef1d4ea84861b
This commit is contained in:
Yoshisato Yanagisawa 2019-01-10 11:40:26 -08:00 committed by android-build-merger
parent d372e54742 1951e70416
commit cb635521c9
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/goma.mk
View File

@ -17,6 +17,7 @@
# Notice: this works only with Google's Goma build infrastructure. # Notice: this works only with Google's Goma build infrastructure.
ifneq ($(filter-out false,$(USE_GOMA)),) ifneq ($(filter-out false,$(USE_GOMA)),)
# Goma requires a lot of processes and file descriptors. # 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) ifeq ($(shell echo $$(($$(ulimit -u) < 2500 || $$(ulimit -n) < 16000))),1)
$(warning Max user processes and/or open files are insufficient) $(warning Max user processes and/or open files are insufficient)
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
@ -31,26 +32,13 @@ ifneq ($(filter-out false,$(USE_GOMA)),)
else else
goma_dir := $(HOME)/goma goma_dir := $(HOME)/goma
endif endif
goma_ctl := $(goma_dir)/goma_ctl.py
GOMA_CC := $(goma_dir)/gomacc 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 # Append gomacc to existing *_WRAPPER variables so it's possible to
# use both ccache and gomacc. # use both ccache and gomacc.
CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC)) CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC))
CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC)) CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC))
JAVAC_WRAPPER := $(strip $(JAVAC_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 := goma_dir :=
endif endif