diff --git a/core/base_rules.mk b/core/base_rules.mk index b2bbe46e4b..742119f933 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -477,8 +477,6 @@ endif ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) ifneq ($(LOCAL_INSTALLED_MODULE),$(my_default_test_module)) -# Install into the testcase folder -$(LOCAL_INSTALLED_MODULE) : $(my_default_test_module) $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD) $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) @echo "Install: $@" @@ -622,6 +620,13 @@ endif multi_arch := +my_default_test_module := +my_default_test_module := $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)$(arch_dir)/$(my_installed_module_stem) +ifneq ($(LOCAL_INSTALLED_MODULE),$(my_default_test_module)) +# Install into the testcase folder +$(LOCAL_INSTALLED_MODULE) : $(my_default_test_module) +endif + # The module itself. $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \