commit 5f4274609f8a0002455051a3045ddcf27c0f292c
author Dan Willemsen <dwillemsen@google.com> Wed May 24 03:32:20 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 24 03:32:21 2017 +0000
tree 182bce94de5891681a71acda15bc9932892a5c52
parent 5d80b734f2bd5f1c22b5d4400022e245cbeb3fe9
parent 988a08d009aee8eac59c76bcd2b84f637c8bc4d3

Merge "Fix override warnings when two test suites share an output"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 4babd60..63b123e 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -3232,10 +3232,10 @@
 # Requires for each suite: my_compat_dist_$(suite) to be defined.
 define create-suite-dependencies
 $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
-  $(eval my_compat_files_$(suite) := $(call copy-many-files, $(my_compat_dist_$(suite)))) \
   $(eval COMPATIBILITY.$(suite).FILES := \
-    $(COMPATIBILITY.$(suite).FILES) $(my_compat_files_$(suite))) \
-  $(eval $(my_all_targets) : $(my_compat_files_$(suite))))
+    $(COMPATIBILITY.$(suite).FILES) $(foreach f,$(my_compat_dist_$(suite)),$(call word-colon,2,$(f))))) \
+$(eval $(my_all_targets) : $(call copy-many-files, \
+  $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_$(suite))))))
 endef
 
 ###########################################################