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

Merge "Remove use of .INTERMEDIATE" am: dda5e96b14 

am: 24ef58d163

* commit '24ef58d1638716c1fdbc130e6cf871d052e9d672':
  Remove use of .INTERMEDIATE
This commit is contained in:
Colin Cross 2015-10-28 21:15:27 +00:00 committed by android-build-merger
parent 72d90d25d0 24ef58d163
commit 0dc087dff7
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/ninja.mk
View File

@ -2,7 +2,7 @@ KATI ?= $(HOST_OUT_EXECUTABLES)/ckati
MAKEPARALLEL ?= $(HOST_OUT_EXECUTABLES)/makeparallel MAKEPARALLEL ?= $(HOST_OUT_EXECUTABLES)/makeparallel
KATI_OUTPUT_PATTERNS := $(OUT_DIR)/build%.ninja $(OUT_DIR)/ninja%.sh KATI_OUTPUT_PATTERNS := $(OUT_DIR)/build%.ninja $(OUT_DIR)/ninja%.sh
NINJA_GOALS := fastincremental generateonly droid showcommands NINJA_GOALS := droid showcommands
# A list of goals which affect parsing of make. # A list of goals which affect parsing of make.
PARSE_TIME_MAKE_GOALS := \ PARSE_TIME_MAKE_GOALS := \
$(PARSE_TIME_MAKE_GOALS) \ $(PARSE_TIME_MAKE_GOALS) \
@ -91,8 +91,6 @@ $(shell mkdir -p $(dir $(my_ninja_suffix_file)) && \
echo $(my_checksum_suffix) > $(my_ninja_suffix_file)) echo $(my_checksum_suffix) > $(my_ninja_suffix_file))
endif endif
KATI_OUTPUTS := $(KATI_BUILD_NINJA) $(KATI_NINJA_SH)
ifeq (,$(NINJA_STATUS)) ifeq (,$(NINJA_STATUS))
NINJA_STATUS := [%p %s/%t]$(space) NINJA_STATUS := [%p %s/%t]$(space)
endif endif
@ -114,27 +112,15 @@ else
NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja
endif endif
ifeq (,$(filter generateonly,$(ORIGINAL_MAKECMDGOALS))) droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja_wrapper
fastincremental droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja.intermediate
@#empty @#empty
.INTERMEDIATE: ninja.intermediate .PHONY: ninja_wrapper
ninja.intermediate: $(KATI_OUTPUTS) $(MAKEPARALLEL) ninja_wrapper: $(KATI_BUILD_NINJA) $(MAKEPARALLEL)
@echo Starting build with ninja @echo Starting build with ninja
+$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) $(filter-out dist,$(ANDROID_TARGETS)) -C $(TOP) $(NINJA_ARGS) +$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) $(filter-out dist,$(ANDROID_TARGETS)) -C $(TOP) $(NINJA_ARGS)
else
generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS)
@#empty
endif
ifeq (,$(filter fastincremental,$(ORIGINAL_MAKECMDGOALS))) $(KATI_BUILD_NINJA): $(KATI) $(MAKEPARALLEL) FORCE
KATI_FORCE := FORCE
endif
$(KATI_OUTPUTS): kati.intermediate $(KATI_FORCE)
.INTERMEDIATE: kati.intermediate
kati.intermediate: $(KATI) $(MAKEPARALLEL)
@echo Running kati to generate build$(KATI_NINJA_SUFFIX).ninja... @echo Running kati to generate build$(KATI_NINJA_SUFFIX).ninja...
+$(hide) $(KATI_MAKEPARALLEL) $(KATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo --use_find_emulator -f build/core/main.mk $(KATI_TARGETS) --gen_all_targets BUILDING_WITH_NINJA=true +$(hide) $(KATI_MAKEPARALLEL) $(KATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo --use_find_emulator -f build/core/main.mk $(KATI_TARGETS) --gen_all_targets BUILDING_WITH_NINJA=true