am bc195b36: am 6fb36397: Merge "Use /ninja_build to mark ninja build."

* commit 'bc195b36d7fa0cbd35d12449d37f8aefb60ea946':
  Use $(OUT_DIR)/ninja_build to mark ninja build.
This commit is contained in:
Ying Wang 2015-09-16 23:26:41 +00:00 committed by Android Git Automerger
commit 58de128998

View file

@ -93,8 +93,14 @@ include $(BUILD_SYSTEM)/help.mk
include $(BUILD_SYSTEM)/config.mk
ifeq ($(USE_NINJA),true)
# Mark this is a ninja build.
$(shell mkdir -p $(OUT_DIR) && touch $(OUT_DIR)/ninja_build)
include build/core/ninja.mk
else # !USE_NINJA
ifeq ($(MAKELEVEL),0)
# Remove ninja build mark if it exists.
$(shell rm -f $(OUT_DIR)/ninja_build)
endif
# Write the build number to a file so it can be read back in
# without changing the command line every time. Avoids rebuilds