Merge "Check USE_GOMA consistently" am: 049dd57872 am: 60204ae5ba am: f1d3d9aab7

am: 9b02b82945

Change-Id: Iba34cf7f5ef922a7cec28a7274b78af004de745f
This commit is contained in:
Dan Willemsen 2016-08-30 02:29:23 +00:00 committed by android-build-merger
commit b526732b1b

View file

@ -114,7 +114,7 @@ endif
# proceeding with undefined behavior.
NINJA_EXTRA_ARGS += -w dupbuild=err
ifdef USE_GOMA
ifneq ($(filter-out false,$(USE_GOMA)),)
KATI_MAKEPARALLEL := $(MAKEPARALLEL)
# Ninja runs remote jobs (i.e., commands which contain gomacc) with
# this parallelism. Note the parallelism of all other jobs is still