Switch to the new mmma implementation using make goals.
Bug: 24309760
Change-Id: Ia79bbdcd396bd5cadf3deac27cb121b9a816d465
diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index 761652f..dc1632d 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -283,8 +283,15 @@
target_build_string, self._options.make_jobs, self._root_path,
extra_args_string)
# mmma equivalent, used when regular mmm fails
- alt_cmd = 'make -j%s -C "%s" -f build/core/main.mk %s all_modules BUILD_MODULES_IN_PATHS="%s"' % (
- self._options.make_jobs, self._root_path, extra_args_string, target_dir_build_string)
+ mmma_goals = []
+ for d in target_dir_list:
+ if d.startswith("./"):
+ d = d[2:]
+ if d.endswith("/"):
+ d = d[:-1]
+ mmma_goals.append("MODULES-IN/" + d)
+ alt_cmd = 'make -j%s -C "%s" -f build/core/main.mk %s %s' % (
+ self._options.make_jobs, self._root_path, extra_args_string, " ".join(mmma_goals))
logger.Log(cmd)
if not self._options.preview: