Merge "Fix override warnings when two test suites share an output" am: 5f4274609f

am: a0d3365510

Change-Id: Ic0d36e8cfa0addc44e4e9b9b78591f4baf2adc0e
This commit is contained in:
Dan Willemsen 2017-05-24 03:38:33 +00:00 committed by android-build-merger
commit 9f64ca8413
1 changed files with 3 additions and 3 deletions

View File

@ -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
###########################################################