commit 614a5aea0efb72e604649b1190a16c6e05ffeb8c
author Ziwei Zhang <zhangxh@google.com> Thu Feb 01 11:01:54 2024 +0800
committer Ziwei Zhang <zhangxh@google.com> Sun Feb 04 03:18:52 2024 +0000
tree 887875e8e268ce83203235cce65883e52e0aa184
parent 7ba1e17dcce8028cd0400ed61b2a038b754244d6

Generate 2.0 config for Mobly test.

- Add `v2` suffix for ATS 2.0 config.
- Update the mobly test config template.

Test: m CtsBluetoothMultiDevicesTestCases (with `runner = "mobly"`)
Bug: 299850687
Change-Id: Ic95ecb760989818291f0746054e4f68d12359a9f

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 44e1c7a..88621c2 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -806,7 +806,7 @@
   ifneq (,$(test_config))
     $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
       $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
-        $(test_config):$(dir)/$(LOCAL_MODULE).config)))
+        $(test_config):$(dir)/$(LOCAL_MODULE).config$(LOCAL_TEST_CONFIG_SUFFIX))))
   endif
 
   ifneq (,$(LOCAL_EXTRA_FULL_TEST_CONFIGS))