commit c2fdc230fc6565f0f7bb3ceba2bdbfffa1a7b9c0
author Dan Willemsen <dwillemsen@google.com> Sun Oct 21 08:56:27 2018 -0700
committer Dan Willemsen <dwillemsen@google.com> Sun Oct 21 08:56:27 2018 -0700
tree 8ef63f2aef6f8b4e0099802dc9a9aa52e087c4f6
parent b519ed5983c180b7bae43b12e1047a7b2b97604f

Fix creating _dist_<goal> 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

diff --git a/packaging/distdir.mk b/packaging/distdir.mk
index f1ef336..264a8b0 100644
--- a/packaging/distdir.mk
+++ b/packaging/distdir.mk
@@ -24,7 +24,8 @@
   $(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)