From 988a08d009aee8eac59c76bcd2b84f637c8bc4d3 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 23 May 2017 15:02:12 -0700 Subject: [PATCH] Fix override warnings when two test suites share an output Test: (internal master); m -j nothing, check warnings Test: Spot check differences in build-*.ninja Change-Id: I160583faa69d090f9b97a8a600598a39a8b1ed9c --- core/definitions.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index 4babd60b9..63b123ea6 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -3232,10 +3232,10 @@ endef # 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 ###########################################################