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

Commit 5cac6f2a authored by nelsonli's avatar nelsonli Committed by android-build-merger
Browse files

Merge "Build: Ensuring test runtime dependencies are installed." am: 71ec795e 

am: 1d49779e

Change-Id: I1dd93e3469f4ee366d9f641cbbca2a9f296c7230
parents 3182dce1 1d49779e

core/base_rules.mk

+7 −2
Original line number Diff line number Diff line
@@ -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)), \