ATest: Use module path for MODULE-IN target.
Atest will fail to build test artifacts if test config is in subdirectory
of actual build file.
Bug: 118408870
Test: apply aosp/800393
atest hello_world_test_with_config
atest atest ahat-tests -v
atest ScreenDecorWindowTests
Change-Id: Ic2798dbbf908507f72d2d9d1b91cb2c522272599
diff --git a/atest/test_finders/module_finder.py b/atest/test_finders/module_finder.py
index 4933e19..ada758e 100644
--- a/atest/test_finders/module_finder.py
+++ b/atest/test_finders/module_finder.py
@@ -290,8 +290,9 @@
config_file = os.path.join(self.root_dir, rel_config)
targets = test_finder_utils.get_targets_from_xml(config_file,
self.module_info)
- mod_dir = os.path.dirname(rel_config).replace('/', '-')
- targets.add(_MODULES_IN % mod_dir)
+ for module_path in self.module_info.get_paths(module_name):
+ mod_dir = module_path.replace('/', '-')
+ targets.add(_MODULES_IN % mod_dir)
return targets
def _get_module_test_config(self, module_name, rel_config=None):