Merge "Use NEON for CTS/SDK/VTS builds too (64-bit edition)."
diff --git a/core/binary.mk b/core/binary.mk
index c3878f9..e7b0c52 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -913,8 +913,6 @@
# Thus we'll actually generate source for each architecture.
$(foreach s,$(vts_src),\
$(eval $(call define-vts-cpp-rule,$(s),$(vts_gen_cpp_root),vts_gen_cpp)))
-$(foreach cpp,$(vts_gen_cpp), \
- $(call include-depfile,$(addsuffix .vts.P,$(basename $(cpp))),$(cpp)))
$(call track-src-file-gen,$(vts_src),$(vts_gen_cpp))
$(vts_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE)
diff --git a/core/definitions.mk b/core/definitions.mk
index a675080..a9807f1 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1023,7 +1023,7 @@
@mkdir -p $(dir $@)
@mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR)
@echo "Generating C++ from VTS: $(PRIVATE_MODULE) <= $<"
-$(hide) $(VTSC) -d$(basename $@).vts.P $(PRIVATE_VTS_FLAGS) \
+$(hide) $(VTSC) -TODO_b/120496070 $(PRIVATE_VTS_FLAGS) \
$< $(PRIVATE_HEADER_OUTPUT_DIR) $@
endef
diff --git a/core/goma.mk b/core/goma.mk
index 3787dfd..f5064e6 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -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 @@
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