Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 210d2d08 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am b9599804: Merge "Move the dist-as-droid handling from make to ninja" 

* commit 'b9599804':
  Move the dist-as-droid handling from make to ninja
parents 35907067 b9599804

core/distdir.mk

+0 −5
Original line number Original line Diff line number Diff line
@@ -22,11 +22,6 @@ dist: ; 




dist_goal := $(strip $(filter dist,$(MAKECMDGOALS)))

dist_goal := $(strip $(filter dist,$(MAKECMDGOALS)))

MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))

MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))

ifeq (,$(strip $(filter-out $(INTERNAL_MODIFIER_TARGETS),$(MAKECMDGOALS))))

# The commandline was something like "make dist" or "make dist showcommands".

# Add a dependency on a real target.

dist: $(DEFAULT_GOAL)

endif





ifdef dist_goal

ifdef dist_goal

core/ninja.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ fastincremental droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja.intermediate 
.INTERMEDIATE: ninja.intermediate

.INTERMEDIATE: ninja.intermediate

ninja.intermediate: $(KATI_OUTPUTS) $(MAKEPARALLEL)

ninja.intermediate: $(KATI_OUTPUTS) $(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) -C $(TOP) $(NINJA_ARGS) $(ANDROID_TARGETS)

	+$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) -C $(TOP) $(NINJA_ARGS) $(filter-out dist,$(ANDROID_TARGETS))

else

else

generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS)

generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS)

	@#empty

	@#empty