openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Allow USE_GOMA=true without explicit USE_NINJA=true 

Now ninja build is disabled only with USE_NINJA=false. So goma.mk
should fail with an error only when USE_NINJA=false is explicitly
specified.

Change-Id: I2fb913433d5c1e93ed2a9bd93bb5000cabd835a4
This commit is contained in:
Shinichiro Hamaji 2015-09-24 15:19:08 +09:00
parent 14342066db
commit d8f268ecac
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
ifdef GOMA_DIR