Merge "Check USE_GOMA consistently" am: 049dd57872

am: 60204ae5ba

Change-Id: I4bb034cecfab78d3a4b5683cd356c6230a04cc7a
This commit is contained in:
Dan Willemsen 2016-08-30 01:19:21 +00:00 committed by android-build-merger
commit f1d3d9aab7
1 changed files with 1 additions and 1 deletions

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