From 3e73e2bca6535a1ebfe7182f4f2c9e88de82301c Mon Sep 17 00:00:00 2001 From: Simran Basi Date: Wed, 19 Apr 2017 16:10:45 -0700 Subject: [PATCH] base_rules.mk : Support subconfigs for testcases. Updates the test module build rules to also copy over any extra test configs that match the naming convention of LOCAL_MODULE_*.config Bug: 37315907 Test: forrest test HelloWorldTests_HalloWelt Change-Id: Ie476285fe780cb19264f1fb0294008b21893a4ed --- core/base_rules.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/base_rules.mk b/core/base_rules.mk index ff6f5bdcf..2157517fe 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -479,6 +479,13 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ $(LOCAL_PATH)/DynamicConfig.xml:$(dir)/$(LOCAL_MODULE).dynamic))) endif + +ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config)) +$(foreach extra_config, $(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config), \ + $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ + $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ + $(extra_config):$(dir)/$(notdir $(extra_config)))))) +endif endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files $(call create-suite-dependencies)