From c2fdc230fc6565f0f7bb3ceba2bdbfffa1a7b9c0 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Sun, 21 Oct 2018 08:56:27 -0700 Subject: [PATCH] Fix creating _dist_ targets under !dist I had initially thought that we would have created the rule when marking it as PHONY, but that's apparently not the case. Bug: 117463001 Test: m test-art-host-gtest Change-Id: I5e397423dfb138725db0e3e07b2630f8e872bb12 --- packaging/distdir.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/distdir.mk b/packaging/distdir.mk index f1ef336317..264a8b098c 100644 --- a/packaging/distdir.mk +++ b/packaging/distdir.mk @@ -24,7 +24,8 @@ $(foreach pair,$(DIST_GOAL_OUTPUT_PAIRS), \ $(eval output := $(call word-colon,2,$(pair))) \ $(eval .PHONY: _dist_$$(goal)) \ $(if $(call streq,$(DIST),true),\ - $(eval _dist_$$(goal): $$(DIST_DIR)/$$(output)))) + $(eval _dist_$$(goal): $$(DIST_DIR)/$$(output)), \ + $(eval _dist_$$(goal):))) define copy-one-dist-file $(2): $(1)