Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f64ca84 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

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

am: a0d33655

Change-Id: Ic0d36e8cfa0addc44e4e9b9b78591f4baf2adc0e
parents 5851c47e a0d33655

core/definitions.mk

+3 −3
Original line number Diff line number Diff line
@@ -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



###########################################################