p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true" 

* commit '6b37c7b32af667f6a42b397a27add34d3c59e5fa':
  Allow USE_GOMA=true without explicit USE_NINJA=true
This commit is contained in:
Shinichiro Hamaji 2015-09-25 04:28:50 +00:00 committed by Android Git Automerger
parent 45b0c8f163 6b37c7b32a
commit 412e7ee1f9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/goma.mk
View File

@ -16,13 +16,14 @@
# Notice: this works only with Google's Goma build infrastructure.
ifneq ($(USE_GOMA),)
# Check if USE_NINJA is defined because GNU make won't work well
# with goma. Note this file is evaluated twice, once with
# USE_NINJA=true by GNU make and once with USE_NINJA=false by kati
# which is invoked by GNU make. So, we cannot test the value of
# USE_NINJA.
ifndef USE_NINJA
$(error USE_GOMA=true works only with USE_NINJA=true)
# Check if USE_NINJA is not false because GNU make won't work well
# with goma. Note this file is evaluated twice, once by GNU make and
# once by kati with USE_NINJA=false. We do this check in the former
# pass.
ifndef KATI
ifeq ($(USE_NINJA),false)
$(error USE_GOMA=true is not compatible with USE_NINJA=false)
endif
endif
# Goma requires a lot of processes and file descriptors.