aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2019-01-10 13:24:03 -0600
committerGerrit Code Review2019-01-10 13:24:03 -0600
commit1951e7041644a350ffc80be9ff5754918cf4b5a3 (patch)
treec75cdf9ef86d2443fcd1dfae527772ad5b300a58
parent82f2cb078fd7cdbe144eb71d653d88d62bfdd37f (diff)
parentf07f721235e9f074cdb7c470ad52d2f240d4e706 (diff)
downloadplatform-build-1951e7041644a350ffc80be9ff5754918cf4b5a3.tar.gz
platform-build-1951e7041644a350ffc80be9ff5754918cf4b5a3.tar.xz
platform-build-1951e7041644a350ffc80be9ff5754918cf4b5a3.zip
Merge "Remove code to start Goma compiler_proxy."
-rw-r--r--core/goma.mk14
1 files changed, 1 insertions, 13 deletions
diff --git a/core/goma.mk b/core/goma.mk
index 3787dfd19..f5064e621 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -17,6 +17,7 @@
17# Notice: this works only with Google's Goma build infrastructure. 17# Notice: this works only with Google's Goma build infrastructure.
18ifneq ($(filter-out false,$(USE_GOMA)),) 18ifneq ($(filter-out false,$(USE_GOMA)),)
19 # Goma requires a lot of processes and file descriptors. 19 # Goma requires a lot of processes and file descriptors.
20 # TODO(yyanagisawa): move these code to build/soong/uil/build/goma.go
20 ifeq ($(shell echo $$(($$(ulimit -u) < 2500 || $$(ulimit -n) < 16000))),1) 21 ifeq ($(shell echo $$(($$(ulimit -u) < 2500 || $$(ulimit -n) < 16000))),1)
21 $(warning Max user processes and/or open files are insufficient) 22 $(warning Max user processes and/or open files are insufficient)
22 ifeq ($(shell uname),Darwin) 23 ifeq ($(shell uname),Darwin)
@@ -31,26 +32,13 @@ ifneq ($(filter-out false,$(USE_GOMA)),)
31 else 32 else
32 goma_dir := $(HOME)/goma 33 goma_dir := $(HOME)/goma
33 endif 34 endif
34 goma_ctl := $(goma_dir)/goma_ctl.py
35 GOMA_CC := $(goma_dir)/gomacc 35 GOMA_CC := $(goma_dir)/gomacc
36 36
37 $(if $(wildcard $(goma_ctl)),, \
38 $(warning You should have goma in $$GOMA_DIR or $(HOME)/goma) \
39 $(error See go/ma/how-to-use-goma/how-to-use-goma-for-android for detail))
40
41 # Append gomacc to existing *_WRAPPER variables so it's possible to 37 # Append gomacc to existing *_WRAPPER variables so it's possible to
42 # use both ccache and gomacc. 38 # use both ccache and gomacc.
43 CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC)) 39 CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC))
44 CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC)) 40 CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC))
45 JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC)) 41 JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC))
46 42
47 # gomacc can start goma client's daemon process automatically, but
48 # it is safer and faster to start up it beforehand. We run this as a
49 # background process so this won't slow down the build.
50 ifndef NOSTART_GOMA
51 $(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
52 endif
53
54 goma_ctl :=
55 goma_dir := 43 goma_dir :=
56endif 44endif