From 4133793ce3e17dc5364564c0714f7cc0c4b2c93f Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 26 Jan 2018 16:57:57 -0800 Subject: [PATCH] Fix multilib test data being installed twice to the same place Fixes lots of warnings of the form: build/make/core/base_rules.mk:606: warning: overriding commands for target `out/target/product/generic_arm64/testcases/simpleperf_unit_test/testdata/perf.data' build/make/core/base_rules.mk:606: warning: ignoring old commands for target `out/target/product/generic_arm64/testcases/simpleperf_unit_test/testdata/perf.data' Test: lunch aosp_arm64-eng; m device-tests Change-Id: I32575d25f3aef1d4000fcb63d6ffc025ad21f937 --- core/base_rules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index b4d88889d..3ff3bd3f2 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -590,9 +590,6 @@ $(foreach extra_config, $(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config), \ endif endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files -arch_dir := -is_native := - ifneq ($(my_test_data_file_pairs),) $(foreach pair, $(my_test_data_file_pairs), \ $(eval parts := $(subst :,$(space),$(pair))) \ @@ -603,6 +600,9 @@ $(foreach pair, $(my_test_data_file_pairs), \ $(src_path):$(call append-path,$(dir),$(file)))))) endif +arch_dir := +is_native := + $(call create-suite-dependencies) endif # LOCAL_COMPATIBILITY_SUITE