Use soong_ui.bash instead of the deprecated make wrapper

Test: ./art/test/testrunner/run_build_test_target.py -j50 art-gtest
Change-Id: I166d5c7b480289fbe25ba13d0f5e8593125d6160

2 files changed, 2 insertions, 5 deletions

diff --git a/test/testrunner/run_build_test_target.py b/test/testrunner/run_build_test_target.py
index f262059fb7..14287b0f16 100755
--- a/test/testrunner/run_build_test_target.py
+++ b/test/testrunner/run_build_test_target.py
@@ -63,10 +63,9 @@ print(custom_env)
 os.environ.update(custom_env)
 
 if 'make' in target:
-  build_command = 'make'
+  build_command = 'build/soong/soong_ui.bash --make-mode'
   build_command += ' DX='
   build_command += ' -j' + str(n_threads)
-  build_command += ' -C ' + env.ANDROID_BUILD_TOP
   build_command += ' ' + target.get('make')
   if env.DIST_DIR:
     build_command += ' dist'
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 2fa7d2ae96..d2f47754e6 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -1019,10 +1019,8 @@ def main():
       build_targets += 'test-art-target-run-test-dependencies '
     if 'jvm' in _user_input_variants['target']:
       build_targets += 'test-art-host-run-test-dependencies '
-    build_command = 'make'
+    build_command = 'build/soong/soong_ui.bash --make-mode'
     build_command += ' DX='
-    build_command += ' -j'
-    build_command += ' -C ' + env.ANDROID_BUILD_TOP
     build_command += ' ' + build_targets
     if subprocess.call(build_command.split()):
       # Debugging for b/62653020