runtest: Fix mmm equivalent
This was installing all modules defined in Soong, since we always load
the Soong-generated Makefile for mm/mmm. So use MODULES-IN-* instead of
all_modules.
Also switch to the new GET-INSTALL-PATH-IN-* arguments.
Bug: 30191725
Change-Id: I8a660e24c9933f3f77eb23efd71f8e374a248576
diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index 1b64b4b..26e3607 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -289,19 +289,21 @@
target_dir_build_string = " ".join(target_dir_list)
extra_args_string = " ".join(extra_args_set)
- # mmm cannot be used from python, so perform a similar operation using
- # ONE_SHOT_MAKEFILE
- cmd = 'ONE_SHOT_MAKEFILE="%s" make -j%s -C "%s" GET-INSTALL-PATH all_modules %s' % (
- target_build_string, self._options.make_jobs, self._root_path,
- extra_args_string)
- # mmma equivalent, used when regular mmm fails
+ install_path_goals = []
mmma_goals = []
for d in target_dir_list:
if d.startswith("./"):
d = d[2:]
if d.endswith("/"):
d = d[:-1]
+ install_path_goals.append("GET-INSTALL-PATH-IN-" + d.replace("/","-"))
mmma_goals.append("MODULES-IN-" + d.replace("/","-"))
+ # mmm cannot be used from python, so perform a similar operation using
+ # ONE_SHOT_MAKEFILE
+ cmd = 'ONE_SHOT_MAKEFILE="%s" make -j%s -C "%s" %s %s %s' % (
+ target_build_string, self._options.make_jobs, self._root_path,
+ " ".join(install_path_goals), " ".join(mmma_goals), extra_args_string)
+ # mmma cannot be used from python, so perform a similar operation
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))
