commit 3e73e2bca6535a1ebfe7182f4f2c9e88de82301c
author Simran Basi <sbasi@google.com> Wed Apr 19 16:10:45 2017 -0700
committer Simran Basi <sbasi@google.com> Mon Apr 24 11:43:36 2017 -0700
tree 3941b9d74f928482ea005780a88583e917eb0003
parent cd46573189ac8021b109a855c1e708fde624f04b

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

diff --git a/core/base_rules.mk b/core/base_rules.mk
index ff6f5bd..2157517 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -479,6 +479,13 @@
   $(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)