Merge "Fix override warnings when two test suites share an output" am: 5f4274609f
am: a0d3365510
am: 9f64ca8413
Change-Id: I5e06436c54f8c6a1e2d90f6e5728604d8b2a3ff5
This commit is contained in:
commit
4a05738a8e
1 changed files with 3 additions and 3 deletions
|
@ -3240,10 +3240,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
|
||||
|
||||
###########################################################
|
||||
|
|
Loading…
Reference in a new issue