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
diff --git a/core/base_rules.mk b/core/base_rules.mk
index b4d8888..3ff3bd3 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -590,9 +590,6 @@
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 @@
$(src_path):$(call append-path,$(dir),$(file))))))
endif
+arch_dir :=
+is_native :=
+
$(call create-suite-dependencies)
endif # LOCAL_COMPATIBILITY_SUITE