aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2019-01-11 11:31:06 -0600
committerGerrit Code Review2019-01-11 11:31:06 -0600
commit3ca411b18bfa450edb62d852ecd83fab9f53419c (patch)
treeb47e2ae9e1bb9348a0944da0af553fc2d4fb5740
parente093534aba696d54e0fd8a21b08abfd0ad74c019 (diff)
parent391cbc5409b422a3db6f5b400408542c7be1400b (diff)
downloadplatform-build-3ca411b18bfa450edb62d852ecd83fab9f53419c.tar.gz
platform-build-3ca411b18bfa450edb62d852ecd83fab9f53419c.tar.xz
platform-build-3ca411b18bfa450edb62d852ecd83fab9f53419c.zip
Merge "Remove Goma resource check code."
-rw-r--r--core/goma.mk11
1 files changed, 0 insertions, 11 deletions
diff --git a/core/goma.mk b/core/goma.mk
index f5064e621..c265259da 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -16,17 +16,6 @@
16 16
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.
20 # TODO(yyanagisawa): move these code to build/soong/uil/build/goma.go
21 ifeq ($(shell echo $$(($$(ulimit -u) < 2500 || $$(ulimit -n) < 16000))),1)
22 $(warning Max user processes and/or open files are insufficient)
23 ifeq ($(shell uname),Darwin)
24 $(error See go/ma/how-to-use-goma/how-to-use-goma-for-android to relax the limit)
25 else
26 $(error Adjust the limit by ulimit -u and ulimit -n)
27 endif
28 endif
29
30 ifdef GOMA_DIR 19 ifdef GOMA_DIR
31 goma_dir := $(GOMA_DIR) 20 goma_dir := $(GOMA_DIR)
32 else 21 else