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

Commit 4a05738a 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 

am: 9f64ca84

Change-Id: I5e06436c54f8c6a1e2d90f6e5728604d8b2a3ff5
parents b05bfaa0 9f64ca84

core/definitions.mk

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



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