commit 37274d530b255c8a7812e2fe95073e10397de85e
author David Srbecky <dsrbecky@google.com> Thu Nov 03 11:04:16 2022 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 03 14:04:29 2022 +0000
tree a3ad6fa50a72c7fce3cd7130d7e3813cee9a3728
parent e0cbf8e02182b18ea4b03285bae45344126329b0

Merge run-test-build.py and art_build_rules.py

These used to be two different processes in bash and python.
It is part of just single step now with no bash-python transitions.

Therefore move the relatively trivial "main" method with the rest
of the build code.

Test: generated build artifacts are identical
Change-Id: I29bd68e3bdc8ad8349b3f054502da06606e76f0a

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 7697e84..c5322cb 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -1886,8 +1886,7 @@
         "art_module_source_build_genrule_defaults",
     ],
     tool_files: [
-        "art_build_rules.py",
-        "run-test-build.py",
+        "run_test_build.py",
         ":art-run-test-bootclasspath",
     ],
     tools: [

test/Android.run-test.bp

diff --git a/test/Android.run-test.bp b/test/Android.run-test.bp
index e71fe44..91d0971 100644
--- a/test/Android.run-test.bp
+++ b/test/Android.run-test.bp
@@ -6,7 +6,7 @@
     out: ["art-run-test-host-data-shard00.zip"],
     srcs: ["*00-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 00 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 00 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -24,7 +24,7 @@
     out: ["art-run-test-host-data-shard01.zip"],
     srcs: ["*01-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 01 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 01 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -42,7 +42,7 @@
     out: ["art-run-test-host-data-shard02.zip"],
     srcs: ["*02-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 02 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 02 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -60,7 +60,7 @@
     out: ["art-run-test-host-data-shard03.zip"],
     srcs: ["*03-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 03 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 03 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -78,7 +78,7 @@
     out: ["art-run-test-host-data-shard04.zip"],
     srcs: ["*04-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 04 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 04 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -96,7 +96,7 @@
     out: ["art-run-test-host-data-shard05.zip"],
     srcs: ["*05-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 05 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 05 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -114,7 +114,7 @@
     out: ["art-run-test-host-data-shard06.zip"],
     srcs: ["*06-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 06 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 06 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -132,7 +132,7 @@
     out: ["art-run-test-host-data-shard07.zip"],
     srcs: ["*07-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 07 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 07 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -150,7 +150,7 @@
     out: ["art-run-test-host-data-shard08.zip"],
     srcs: ["*08-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 08 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 08 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -168,7 +168,7 @@
     out: ["art-run-test-host-data-shard09.zip"],
     srcs: ["*09-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 09 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 09 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -186,7 +186,7 @@
     out: ["art-run-test-host-data-shard10.zip"],
     srcs: ["*10-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 10 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 10 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -204,7 +204,7 @@
     out: ["art-run-test-host-data-shard11.zip"],
     srcs: ["*11-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 11 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 11 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -222,7 +222,7 @@
     out: ["art-run-test-host-data-shard12.zip"],
     srcs: ["*12-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 12 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 12 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -240,7 +240,7 @@
     out: ["art-run-test-host-data-shard13.zip"],
     srcs: ["*13-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 13 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 13 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -258,7 +258,7 @@
     out: ["art-run-test-host-data-shard14.zip"],
     srcs: ["*14-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 14 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 14 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -276,7 +276,7 @@
     out: ["art-run-test-host-data-shard15.zip"],
     srcs: ["*15-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 15 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 15 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -294,7 +294,7 @@
     out: ["art-run-test-host-data-shard16.zip"],
     srcs: ["*16-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 16 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 16 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -312,7 +312,7 @@
     out: ["art-run-test-host-data-shard17.zip"],
     srcs: ["*17-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 17 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 17 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -330,7 +330,7 @@
     out: ["art-run-test-host-data-shard18.zip"],
     srcs: ["*18-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 18 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 18 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -348,7 +348,7 @@
     out: ["art-run-test-host-data-shard19.zip"],
     srcs: ["*19-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 19 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 19 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -366,7 +366,7 @@
     out: ["art-run-test-host-data-shard20.zip"],
     srcs: ["*20-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 20 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 20 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -384,7 +384,7 @@
     out: ["art-run-test-host-data-shard21.zip"],
     srcs: ["*21-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 21 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 21 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -402,7 +402,7 @@
     out: ["art-run-test-host-data-shard22.zip"],
     srcs: ["*22-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 22 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 22 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -420,7 +420,7 @@
     out: ["art-run-test-host-data-shard23.zip"],
     srcs: ["*23-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 23 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 23 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -438,7 +438,7 @@
     out: ["art-run-test-host-data-shard24.zip"],
     srcs: ["*24-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 24 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 24 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -456,7 +456,7 @@
     out: ["art-run-test-host-data-shard25.zip"],
     srcs: ["*25-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 25 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 25 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -474,7 +474,7 @@
     out: ["art-run-test-host-data-shard26.zip"],
     srcs: ["*26-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 26 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 26 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -492,7 +492,7 @@
     out: ["art-run-test-host-data-shard27.zip"],
     srcs: ["*27-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 27 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 27 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -510,7 +510,7 @@
     out: ["art-run-test-host-data-shard28.zip"],
     srcs: ["*28-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 28 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 28 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -528,7 +528,7 @@
     out: ["art-run-test-host-data-shard29.zip"],
     srcs: ["*29-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 29 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 29 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -546,7 +546,7 @@
     out: ["art-run-test-host-data-shard30.zip"],
     srcs: ["*30-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 30 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 30 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -564,7 +564,7 @@
     out: ["art-run-test-host-data-shard31.zip"],
     srcs: ["*31-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 31 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 31 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -582,7 +582,7 @@
     out: ["art-run-test-host-data-shard32.zip"],
     srcs: ["*32-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 32 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 32 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -600,7 +600,7 @@
     out: ["art-run-test-host-data-shard33.zip"],
     srcs: ["*33-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 33 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 33 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -618,7 +618,7 @@
     out: ["art-run-test-host-data-shard34.zip"],
     srcs: ["*34-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 34 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 34 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -636,7 +636,7 @@
     out: ["art-run-test-host-data-shard35.zip"],
     srcs: ["*35-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 35 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 35 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -654,7 +654,7 @@
     out: ["art-run-test-host-data-shard36.zip"],
     srcs: ["*36-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 36 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 36 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -672,7 +672,7 @@
     out: ["art-run-test-host-data-shard37.zip"],
     srcs: ["*37-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 37 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 37 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -690,7 +690,7 @@
     out: ["art-run-test-host-data-shard38.zip"],
     srcs: ["*38-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 38 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 38 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -708,7 +708,7 @@
     out: ["art-run-test-host-data-shard39.zip"],
     srcs: ["*39-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 39 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 39 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -726,7 +726,7 @@
     out: ["art-run-test-host-data-shard40.zip"],
     srcs: ["*40-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 40 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 40 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -744,7 +744,7 @@
     out: ["art-run-test-host-data-shard41.zip"],
     srcs: ["*41-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 41 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 41 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -762,7 +762,7 @@
     out: ["art-run-test-host-data-shard42.zip"],
     srcs: ["*42-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 42 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 42 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -780,7 +780,7 @@
     out: ["art-run-test-host-data-shard43.zip"],
     srcs: ["*43-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 43 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 43 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -798,7 +798,7 @@
     out: ["art-run-test-host-data-shard44.zip"],
     srcs: ["*44-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 44 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 44 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -816,7 +816,7 @@
     out: ["art-run-test-host-data-shard45.zip"],
     srcs: ["*45-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 45 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 45 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -834,7 +834,7 @@
     out: ["art-run-test-host-data-shard46.zip"],
     srcs: ["*46-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 46 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 46 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -852,7 +852,7 @@
     out: ["art-run-test-host-data-shard47.zip"],
     srcs: ["*47-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 47 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 47 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -870,7 +870,7 @@
     out: ["art-run-test-host-data-shard48.zip"],
     srcs: ["*48-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 48 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 48 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -888,7 +888,7 @@
     out: ["art-run-test-host-data-shard49.zip"],
     srcs: ["*49-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 49 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 49 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -906,7 +906,7 @@
     out: ["art-run-test-host-data-shard50.zip"],
     srcs: ["*50-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 50 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 50 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -924,7 +924,7 @@
     out: ["art-run-test-host-data-shard51.zip"],
     srcs: ["*51-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 51 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 51 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -942,7 +942,7 @@
     out: ["art-run-test-host-data-shard52.zip"],
     srcs: ["*52-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 52 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 52 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -960,7 +960,7 @@
     out: ["art-run-test-host-data-shard53.zip"],
     srcs: ["*53-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 53 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 53 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -978,7 +978,7 @@
     out: ["art-run-test-host-data-shard54.zip"],
     srcs: ["*54-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 54 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 54 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -996,7 +996,7 @@
     out: ["art-run-test-host-data-shard55.zip"],
     srcs: ["*55-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 55 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 55 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1014,7 +1014,7 @@
     out: ["art-run-test-host-data-shard56.zip"],
     srcs: ["*56-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 56 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 56 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1032,7 +1032,7 @@
     out: ["art-run-test-host-data-shard57.zip"],
     srcs: ["*57-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 57 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 57 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1050,7 +1050,7 @@
     out: ["art-run-test-host-data-shard58.zip"],
     srcs: ["*58-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 58 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 58 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1068,7 +1068,7 @@
     out: ["art-run-test-host-data-shard59.zip"],
     srcs: ["*59-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 59 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 59 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1086,7 +1086,7 @@
     out: ["art-run-test-host-data-shard60.zip"],
     srcs: ["*60-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 60 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 60 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1104,7 +1104,7 @@
     out: ["art-run-test-host-data-shard61.zip"],
     srcs: ["*61-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 61 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 61 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1122,7 +1122,7 @@
     out: ["art-run-test-host-data-shard62.zip"],
     srcs: ["*62-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 62 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 62 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1140,7 +1140,7 @@
     out: ["art-run-test-host-data-shard63.zip"],
     srcs: ["*63-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 63 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 63 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1158,7 +1158,7 @@
     out: ["art-run-test-host-data-shard64.zip"],
     srcs: ["*64-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 64 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 64 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1176,7 +1176,7 @@
     out: ["art-run-test-host-data-shard65.zip"],
     srcs: ["*65-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 65 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 65 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1194,7 +1194,7 @@
     out: ["art-run-test-host-data-shard66.zip"],
     srcs: ["*66-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 66 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 66 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1212,7 +1212,7 @@
     out: ["art-run-test-host-data-shard67.zip"],
     srcs: ["*67-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 67 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 67 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1230,7 +1230,7 @@
     out: ["art-run-test-host-data-shard68.zip"],
     srcs: ["*68-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 68 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 68 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1248,7 +1248,7 @@
     out: ["art-run-test-host-data-shard69.zip"],
     srcs: ["*69-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 69 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 69 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1266,7 +1266,7 @@
     out: ["art-run-test-host-data-shard70.zip"],
     srcs: ["*70-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 70 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 70 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1284,7 +1284,7 @@
     out: ["art-run-test-host-data-shard71.zip"],
     srcs: ["*71-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 71 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 71 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1302,7 +1302,7 @@
     out: ["art-run-test-host-data-shard72.zip"],
     srcs: ["*72-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 72 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 72 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1320,7 +1320,7 @@
     out: ["art-run-test-host-data-shard73.zip"],
     srcs: ["*73-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 73 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 73 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1338,7 +1338,7 @@
     out: ["art-run-test-host-data-shard74.zip"],
     srcs: ["*74-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 74 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 74 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1356,7 +1356,7 @@
     out: ["art-run-test-host-data-shard75.zip"],
     srcs: ["*75-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 75 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 75 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1374,7 +1374,7 @@
     out: ["art-run-test-host-data-shard76.zip"],
     srcs: ["*76-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 76 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 76 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1392,7 +1392,7 @@
     out: ["art-run-test-host-data-shard77.zip"],
     srcs: ["*77-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 77 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 77 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1410,7 +1410,7 @@
     out: ["art-run-test-host-data-shard78.zip"],
     srcs: ["*78-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 78 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 78 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1428,7 +1428,7 @@
     out: ["art-run-test-host-data-shard79.zip"],
     srcs: ["*79-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 79 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 79 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1446,7 +1446,7 @@
     out: ["art-run-test-host-data-shard80.zip"],
     srcs: ["*80-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 80 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 80 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1464,7 +1464,7 @@
     out: ["art-run-test-host-data-shard81.zip"],
     srcs: ["*81-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 81 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 81 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1482,7 +1482,7 @@
     out: ["art-run-test-host-data-shard82.zip"],
     srcs: ["*82-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 82 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 82 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1500,7 +1500,7 @@
     out: ["art-run-test-host-data-shard83.zip"],
     srcs: ["*83-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 83 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 83 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1518,7 +1518,7 @@
     out: ["art-run-test-host-data-shard84.zip"],
     srcs: ["*84-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 84 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 84 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1536,7 +1536,7 @@
     out: ["art-run-test-host-data-shard85.zip"],
     srcs: ["*85-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 85 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 85 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1554,7 +1554,7 @@
     out: ["art-run-test-host-data-shard86.zip"],
     srcs: ["*86-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 86 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 86 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1572,7 +1572,7 @@
     out: ["art-run-test-host-data-shard87.zip"],
     srcs: ["*87-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 87 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 87 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1590,7 +1590,7 @@
     out: ["art-run-test-host-data-shard88.zip"],
     srcs: ["*88-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 88 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 88 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1608,7 +1608,7 @@
     out: ["art-run-test-host-data-shard89.zip"],
     srcs: ["*89-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 89 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 89 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1626,7 +1626,7 @@
     out: ["art-run-test-host-data-shard90.zip"],
     srcs: ["*90-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 90 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 90 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1644,7 +1644,7 @@
     out: ["art-run-test-host-data-shard91.zip"],
     srcs: ["*91-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 91 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 91 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1662,7 +1662,7 @@
     out: ["art-run-test-host-data-shard92.zip"],
     srcs: ["*92-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 92 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 92 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1680,7 +1680,7 @@
     out: ["art-run-test-host-data-shard93.zip"],
     srcs: ["*93-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 93 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 93 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1698,7 +1698,7 @@
     out: ["art-run-test-host-data-shard94.zip"],
     srcs: ["*94-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 94 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 94 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1716,7 +1716,7 @@
     out: ["art-run-test-host-data-shard95.zip"],
     srcs: ["*95-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 95 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 95 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1734,7 +1734,7 @@
     out: ["art-run-test-host-data-shard96.zip"],
     srcs: ["*96-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 96 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 96 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1752,7 +1752,7 @@
     out: ["art-run-test-host-data-shard97.zip"],
     srcs: ["*97-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 97 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 97 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1770,7 +1770,7 @@
     out: ["art-run-test-host-data-shard98.zip"],
     srcs: ["*98-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 98 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 98 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -1788,7 +1788,7 @@
     out: ["art-run-test-host-data-shard99.zip"],
     srcs: ["*99-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode host --shard 99 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode host --shard 99 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2248,7 +2248,7 @@
     out: ["art-run-test-target-data-shard00.zip"],
     srcs: ["*00-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 00 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 00 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2266,7 +2266,7 @@
     out: ["art-run-test-target-data-shard01.zip"],
     srcs: ["*01-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 01 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 01 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2284,7 +2284,7 @@
     out: ["art-run-test-target-data-shard02.zip"],
     srcs: ["*02-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 02 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 02 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2302,7 +2302,7 @@
     out: ["art-run-test-target-data-shard03.zip"],
     srcs: ["*03-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 03 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 03 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2320,7 +2320,7 @@
     out: ["art-run-test-target-data-shard04.zip"],
     srcs: ["*04-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 04 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 04 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2338,7 +2338,7 @@
     out: ["art-run-test-target-data-shard05.zip"],
     srcs: ["*05-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 05 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 05 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2356,7 +2356,7 @@
     out: ["art-run-test-target-data-shard06.zip"],
     srcs: ["*06-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 06 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 06 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2374,7 +2374,7 @@
     out: ["art-run-test-target-data-shard07.zip"],
     srcs: ["*07-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 07 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 07 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2392,7 +2392,7 @@
     out: ["art-run-test-target-data-shard08.zip"],
     srcs: ["*08-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 08 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 08 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2410,7 +2410,7 @@
     out: ["art-run-test-target-data-shard09.zip"],
     srcs: ["*09-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 09 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 09 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2428,7 +2428,7 @@
     out: ["art-run-test-target-data-shard10.zip"],
     srcs: ["*10-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 10 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 10 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2446,7 +2446,7 @@
     out: ["art-run-test-target-data-shard11.zip"],
     srcs: ["*11-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 11 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 11 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2464,7 +2464,7 @@
     out: ["art-run-test-target-data-shard12.zip"],
     srcs: ["*12-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 12 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 12 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2482,7 +2482,7 @@
     out: ["art-run-test-target-data-shard13.zip"],
     srcs: ["*13-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 13 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 13 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2500,7 +2500,7 @@
     out: ["art-run-test-target-data-shard14.zip"],
     srcs: ["*14-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 14 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 14 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2518,7 +2518,7 @@
     out: ["art-run-test-target-data-shard15.zip"],
     srcs: ["*15-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 15 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 15 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2536,7 +2536,7 @@
     out: ["art-run-test-target-data-shard16.zip"],
     srcs: ["*16-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 16 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 16 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2554,7 +2554,7 @@
     out: ["art-run-test-target-data-shard17.zip"],
     srcs: ["*17-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 17 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 17 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2572,7 +2572,7 @@
     out: ["art-run-test-target-data-shard18.zip"],
     srcs: ["*18-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 18 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 18 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2590,7 +2590,7 @@
     out: ["art-run-test-target-data-shard19.zip"],
     srcs: ["*19-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 19 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 19 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2608,7 +2608,7 @@
     out: ["art-run-test-target-data-shard20.zip"],
     srcs: ["*20-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 20 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 20 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2626,7 +2626,7 @@
     out: ["art-run-test-target-data-shard21.zip"],
     srcs: ["*21-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 21 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 21 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2644,7 +2644,7 @@
     out: ["art-run-test-target-data-shard22.zip"],
     srcs: ["*22-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 22 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 22 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2662,7 +2662,7 @@
     out: ["art-run-test-target-data-shard23.zip"],
     srcs: ["*23-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 23 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 23 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2680,7 +2680,7 @@
     out: ["art-run-test-target-data-shard24.zip"],
     srcs: ["*24-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 24 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 24 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2698,7 +2698,7 @@
     out: ["art-run-test-target-data-shard25.zip"],
     srcs: ["*25-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 25 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 25 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2716,7 +2716,7 @@
     out: ["art-run-test-target-data-shard26.zip"],
     srcs: ["*26-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 26 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 26 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2734,7 +2734,7 @@
     out: ["art-run-test-target-data-shard27.zip"],
     srcs: ["*27-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 27 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 27 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2752,7 +2752,7 @@
     out: ["art-run-test-target-data-shard28.zip"],
     srcs: ["*28-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 28 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 28 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2770,7 +2770,7 @@
     out: ["art-run-test-target-data-shard29.zip"],
     srcs: ["*29-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 29 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 29 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2788,7 +2788,7 @@
     out: ["art-run-test-target-data-shard30.zip"],
     srcs: ["*30-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 30 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 30 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2806,7 +2806,7 @@
     out: ["art-run-test-target-data-shard31.zip"],
     srcs: ["*31-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 31 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 31 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2824,7 +2824,7 @@
     out: ["art-run-test-target-data-shard32.zip"],
     srcs: ["*32-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 32 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 32 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2842,7 +2842,7 @@
     out: ["art-run-test-target-data-shard33.zip"],
     srcs: ["*33-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 33 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 33 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2860,7 +2860,7 @@
     out: ["art-run-test-target-data-shard34.zip"],
     srcs: ["*34-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 34 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 34 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2878,7 +2878,7 @@
     out: ["art-run-test-target-data-shard35.zip"],
     srcs: ["*35-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 35 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 35 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2896,7 +2896,7 @@
     out: ["art-run-test-target-data-shard36.zip"],
     srcs: ["*36-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 36 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 36 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2914,7 +2914,7 @@
     out: ["art-run-test-target-data-shard37.zip"],
     srcs: ["*37-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 37 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 37 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2932,7 +2932,7 @@
     out: ["art-run-test-target-data-shard38.zip"],
     srcs: ["*38-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 38 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 38 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2950,7 +2950,7 @@
     out: ["art-run-test-target-data-shard39.zip"],
     srcs: ["*39-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 39 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 39 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2968,7 +2968,7 @@
     out: ["art-run-test-target-data-shard40.zip"],
     srcs: ["*40-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 40 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 40 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -2986,7 +2986,7 @@
     out: ["art-run-test-target-data-shard41.zip"],
     srcs: ["*41-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 41 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 41 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3004,7 +3004,7 @@
     out: ["art-run-test-target-data-shard42.zip"],
     srcs: ["*42-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 42 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 42 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3022,7 +3022,7 @@
     out: ["art-run-test-target-data-shard43.zip"],
     srcs: ["*43-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 43 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 43 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3040,7 +3040,7 @@
     out: ["art-run-test-target-data-shard44.zip"],
     srcs: ["*44-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 44 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 44 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3058,7 +3058,7 @@
     out: ["art-run-test-target-data-shard45.zip"],
     srcs: ["*45-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 45 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 45 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3076,7 +3076,7 @@
     out: ["art-run-test-target-data-shard46.zip"],
     srcs: ["*46-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 46 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 46 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3094,7 +3094,7 @@
     out: ["art-run-test-target-data-shard47.zip"],
     srcs: ["*47-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 47 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 47 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3112,7 +3112,7 @@
     out: ["art-run-test-target-data-shard48.zip"],
     srcs: ["*48-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 48 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 48 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3130,7 +3130,7 @@
     out: ["art-run-test-target-data-shard49.zip"],
     srcs: ["*49-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 49 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 49 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3148,7 +3148,7 @@
     out: ["art-run-test-target-data-shard50.zip"],
     srcs: ["*50-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 50 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 50 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3166,7 +3166,7 @@
     out: ["art-run-test-target-data-shard51.zip"],
     srcs: ["*51-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 51 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 51 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3184,7 +3184,7 @@
     out: ["art-run-test-target-data-shard52.zip"],
     srcs: ["*52-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 52 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 52 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3202,7 +3202,7 @@
     out: ["art-run-test-target-data-shard53.zip"],
     srcs: ["*53-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 53 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 53 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3220,7 +3220,7 @@
     out: ["art-run-test-target-data-shard54.zip"],
     srcs: ["*54-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 54 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 54 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3238,7 +3238,7 @@
     out: ["art-run-test-target-data-shard55.zip"],
     srcs: ["*55-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 55 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 55 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3256,7 +3256,7 @@
     out: ["art-run-test-target-data-shard56.zip"],
     srcs: ["*56-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 56 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 56 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3274,7 +3274,7 @@
     out: ["art-run-test-target-data-shard57.zip"],
     srcs: ["*57-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 57 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 57 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3292,7 +3292,7 @@
     out: ["art-run-test-target-data-shard58.zip"],
     srcs: ["*58-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 58 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 58 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3310,7 +3310,7 @@
     out: ["art-run-test-target-data-shard59.zip"],
     srcs: ["*59-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 59 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 59 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3328,7 +3328,7 @@
     out: ["art-run-test-target-data-shard60.zip"],
     srcs: ["*60-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 60 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 60 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3346,7 +3346,7 @@
     out: ["art-run-test-target-data-shard61.zip"],
     srcs: ["*61-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 61 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 61 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3364,7 +3364,7 @@
     out: ["art-run-test-target-data-shard62.zip"],
     srcs: ["*62-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 62 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 62 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3382,7 +3382,7 @@
     out: ["art-run-test-target-data-shard63.zip"],
     srcs: ["*63-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 63 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 63 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3400,7 +3400,7 @@
     out: ["art-run-test-target-data-shard64.zip"],
     srcs: ["*64-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 64 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 64 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3418,7 +3418,7 @@
     out: ["art-run-test-target-data-shard65.zip"],
     srcs: ["*65-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 65 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 65 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3436,7 +3436,7 @@
     out: ["art-run-test-target-data-shard66.zip"],
     srcs: ["*66-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 66 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 66 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3454,7 +3454,7 @@
     out: ["art-run-test-target-data-shard67.zip"],
     srcs: ["*67-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 67 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 67 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3472,7 +3472,7 @@
     out: ["art-run-test-target-data-shard68.zip"],
     srcs: ["*68-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 68 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 68 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3490,7 +3490,7 @@
     out: ["art-run-test-target-data-shard69.zip"],
     srcs: ["*69-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 69 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 69 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3508,7 +3508,7 @@
     out: ["art-run-test-target-data-shard70.zip"],
     srcs: ["*70-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 70 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 70 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3526,7 +3526,7 @@
     out: ["art-run-test-target-data-shard71.zip"],
     srcs: ["*71-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 71 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 71 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3544,7 +3544,7 @@
     out: ["art-run-test-target-data-shard72.zip"],
     srcs: ["*72-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 72 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 72 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3562,7 +3562,7 @@
     out: ["art-run-test-target-data-shard73.zip"],
     srcs: ["*73-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 73 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 73 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3580,7 +3580,7 @@
     out: ["art-run-test-target-data-shard74.zip"],
     srcs: ["*74-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 74 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 74 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3598,7 +3598,7 @@
     out: ["art-run-test-target-data-shard75.zip"],
     srcs: ["*75-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 75 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 75 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3616,7 +3616,7 @@
     out: ["art-run-test-target-data-shard76.zip"],
     srcs: ["*76-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 76 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 76 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3634,7 +3634,7 @@
     out: ["art-run-test-target-data-shard77.zip"],
     srcs: ["*77-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 77 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 77 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3652,7 +3652,7 @@
     out: ["art-run-test-target-data-shard78.zip"],
     srcs: ["*78-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 78 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 78 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3670,7 +3670,7 @@
     out: ["art-run-test-target-data-shard79.zip"],
     srcs: ["*79-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 79 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 79 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3688,7 +3688,7 @@
     out: ["art-run-test-target-data-shard80.zip"],
     srcs: ["*80-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 80 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 80 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3706,7 +3706,7 @@
     out: ["art-run-test-target-data-shard81.zip"],
     srcs: ["*81-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 81 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 81 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3724,7 +3724,7 @@
     out: ["art-run-test-target-data-shard82.zip"],
     srcs: ["*82-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 82 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 82 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3742,7 +3742,7 @@
     out: ["art-run-test-target-data-shard83.zip"],
     srcs: ["*83-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 83 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 83 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3760,7 +3760,7 @@
     out: ["art-run-test-target-data-shard84.zip"],
     srcs: ["*84-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 84 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 84 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3778,7 +3778,7 @@
     out: ["art-run-test-target-data-shard85.zip"],
     srcs: ["*85-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 85 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 85 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3796,7 +3796,7 @@
     out: ["art-run-test-target-data-shard86.zip"],
     srcs: ["*86-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 86 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 86 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3814,7 +3814,7 @@
     out: ["art-run-test-target-data-shard87.zip"],
     srcs: ["*87-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 87 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 87 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3832,7 +3832,7 @@
     out: ["art-run-test-target-data-shard88.zip"],
     srcs: ["*88-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 88 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 88 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3850,7 +3850,7 @@
     out: ["art-run-test-target-data-shard89.zip"],
     srcs: ["*89-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 89 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 89 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3868,7 +3868,7 @@
     out: ["art-run-test-target-data-shard90.zip"],
     srcs: ["*90-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 90 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 90 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3886,7 +3886,7 @@
     out: ["art-run-test-target-data-shard91.zip"],
     srcs: ["*91-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 91 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 91 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3904,7 +3904,7 @@
     out: ["art-run-test-target-data-shard92.zip"],
     srcs: ["*92-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 92 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 92 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3922,7 +3922,7 @@
     out: ["art-run-test-target-data-shard93.zip"],
     srcs: ["*93-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 93 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 93 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3940,7 +3940,7 @@
     out: ["art-run-test-target-data-shard94.zip"],
     srcs: ["*94-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 94 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 94 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3958,7 +3958,7 @@
     out: ["art-run-test-target-data-shard95.zip"],
     srcs: ["*95-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 95 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 95 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3976,7 +3976,7 @@
     out: ["art-run-test-target-data-shard96.zip"],
     srcs: ["*96-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 96 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 96 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -3994,7 +3994,7 @@
     out: ["art-run-test-target-data-shard97.zip"],
     srcs: ["*97-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 97 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 97 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4012,7 +4012,7 @@
     out: ["art-run-test-target-data-shard98.zip"],
     srcs: ["*98-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 98 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 98 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4030,7 +4030,7 @@
     out: ["art-run-test-target-data-shard99.zip"],
     srcs: ["*99-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode target --shard 99 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode target --shard 99 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4490,7 +4490,7 @@
     out: ["art-run-test-jvm-data-shard00.zip"],
     srcs: ["*00-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 00 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 00 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4508,7 +4508,7 @@
     out: ["art-run-test-jvm-data-shard01.zip"],
     srcs: ["*01-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 01 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 01 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4526,7 +4526,7 @@
     out: ["art-run-test-jvm-data-shard02.zip"],
     srcs: ["*02-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 02 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 02 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4544,7 +4544,7 @@
     out: ["art-run-test-jvm-data-shard03.zip"],
     srcs: ["*03-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 03 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 03 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4562,7 +4562,7 @@
     out: ["art-run-test-jvm-data-shard04.zip"],
     srcs: ["*04-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 04 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 04 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4580,7 +4580,7 @@
     out: ["art-run-test-jvm-data-shard05.zip"],
     srcs: ["*05-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 05 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 05 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4598,7 +4598,7 @@
     out: ["art-run-test-jvm-data-shard06.zip"],
     srcs: ["*06-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 06 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 06 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4616,7 +4616,7 @@
     out: ["art-run-test-jvm-data-shard07.zip"],
     srcs: ["*07-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 07 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 07 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4634,7 +4634,7 @@
     out: ["art-run-test-jvm-data-shard08.zip"],
     srcs: ["*08-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 08 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 08 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4652,7 +4652,7 @@
     out: ["art-run-test-jvm-data-shard09.zip"],
     srcs: ["*09-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 09 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 09 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4670,7 +4670,7 @@
     out: ["art-run-test-jvm-data-shard10.zip"],
     srcs: ["*10-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 10 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 10 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4688,7 +4688,7 @@
     out: ["art-run-test-jvm-data-shard11.zip"],
     srcs: ["*11-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 11 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 11 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4706,7 +4706,7 @@
     out: ["art-run-test-jvm-data-shard12.zip"],
     srcs: ["*12-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 12 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 12 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4724,7 +4724,7 @@
     out: ["art-run-test-jvm-data-shard13.zip"],
     srcs: ["*13-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 13 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 13 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4742,7 +4742,7 @@
     out: ["art-run-test-jvm-data-shard14.zip"],
     srcs: ["*14-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 14 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 14 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4760,7 +4760,7 @@
     out: ["art-run-test-jvm-data-shard15.zip"],
     srcs: ["*15-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 15 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 15 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4778,7 +4778,7 @@
     out: ["art-run-test-jvm-data-shard16.zip"],
     srcs: ["*16-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 16 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 16 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4796,7 +4796,7 @@
     out: ["art-run-test-jvm-data-shard17.zip"],
     srcs: ["*17-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 17 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 17 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4814,7 +4814,7 @@
     out: ["art-run-test-jvm-data-shard18.zip"],
     srcs: ["*18-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 18 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 18 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4832,7 +4832,7 @@
     out: ["art-run-test-jvm-data-shard19.zip"],
     srcs: ["*19-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 19 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 19 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4850,7 +4850,7 @@
     out: ["art-run-test-jvm-data-shard20.zip"],
     srcs: ["*20-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 20 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 20 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4868,7 +4868,7 @@
     out: ["art-run-test-jvm-data-shard21.zip"],
     srcs: ["*21-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 21 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 21 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4886,7 +4886,7 @@
     out: ["art-run-test-jvm-data-shard22.zip"],
     srcs: ["*22-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 22 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 22 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4904,7 +4904,7 @@
     out: ["art-run-test-jvm-data-shard23.zip"],
     srcs: ["*23-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 23 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 23 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4922,7 +4922,7 @@
     out: ["art-run-test-jvm-data-shard24.zip"],
     srcs: ["*24-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 24 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 24 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4940,7 +4940,7 @@
     out: ["art-run-test-jvm-data-shard25.zip"],
     srcs: ["*25-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 25 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 25 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4958,7 +4958,7 @@
     out: ["art-run-test-jvm-data-shard26.zip"],
     srcs: ["*26-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 26 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 26 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4976,7 +4976,7 @@
     out: ["art-run-test-jvm-data-shard27.zip"],
     srcs: ["*27-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 27 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 27 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -4994,7 +4994,7 @@
     out: ["art-run-test-jvm-data-shard28.zip"],
     srcs: ["*28-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 28 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 28 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5012,7 +5012,7 @@
     out: ["art-run-test-jvm-data-shard29.zip"],
     srcs: ["*29-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 29 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 29 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5030,7 +5030,7 @@
     out: ["art-run-test-jvm-data-shard30.zip"],
     srcs: ["*30-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 30 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 30 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5048,7 +5048,7 @@
     out: ["art-run-test-jvm-data-shard31.zip"],
     srcs: ["*31-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 31 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 31 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5066,7 +5066,7 @@
     out: ["art-run-test-jvm-data-shard32.zip"],
     srcs: ["*32-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 32 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 32 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5084,7 +5084,7 @@
     out: ["art-run-test-jvm-data-shard33.zip"],
     srcs: ["*33-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 33 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 33 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5102,7 +5102,7 @@
     out: ["art-run-test-jvm-data-shard34.zip"],
     srcs: ["*34-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 34 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 34 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5120,7 +5120,7 @@
     out: ["art-run-test-jvm-data-shard35.zip"],
     srcs: ["*35-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 35 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 35 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5138,7 +5138,7 @@
     out: ["art-run-test-jvm-data-shard36.zip"],
     srcs: ["*36-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 36 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 36 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5156,7 +5156,7 @@
     out: ["art-run-test-jvm-data-shard37.zip"],
     srcs: ["*37-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 37 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 37 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5174,7 +5174,7 @@
     out: ["art-run-test-jvm-data-shard38.zip"],
     srcs: ["*38-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 38 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 38 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5192,7 +5192,7 @@
     out: ["art-run-test-jvm-data-shard39.zip"],
     srcs: ["*39-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 39 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 39 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5210,7 +5210,7 @@
     out: ["art-run-test-jvm-data-shard40.zip"],
     srcs: ["*40-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 40 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 40 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5228,7 +5228,7 @@
     out: ["art-run-test-jvm-data-shard41.zip"],
     srcs: ["*41-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 41 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 41 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5246,7 +5246,7 @@
     out: ["art-run-test-jvm-data-shard42.zip"],
     srcs: ["*42-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 42 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 42 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5264,7 +5264,7 @@
     out: ["art-run-test-jvm-data-shard43.zip"],
     srcs: ["*43-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 43 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 43 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5282,7 +5282,7 @@
     out: ["art-run-test-jvm-data-shard44.zip"],
     srcs: ["*44-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 44 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 44 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5300,7 +5300,7 @@
     out: ["art-run-test-jvm-data-shard45.zip"],
     srcs: ["*45-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 45 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 45 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5318,7 +5318,7 @@
     out: ["art-run-test-jvm-data-shard46.zip"],
     srcs: ["*46-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 46 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 46 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5336,7 +5336,7 @@
     out: ["art-run-test-jvm-data-shard47.zip"],
     srcs: ["*47-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 47 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 47 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5354,7 +5354,7 @@
     out: ["art-run-test-jvm-data-shard48.zip"],
     srcs: ["*48-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 48 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 48 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5372,7 +5372,7 @@
     out: ["art-run-test-jvm-data-shard49.zip"],
     srcs: ["*49-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 49 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 49 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5390,7 +5390,7 @@
     out: ["art-run-test-jvm-data-shard50.zip"],
     srcs: ["*50-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 50 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 50 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5408,7 +5408,7 @@
     out: ["art-run-test-jvm-data-shard51.zip"],
     srcs: ["*51-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 51 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 51 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5426,7 +5426,7 @@
     out: ["art-run-test-jvm-data-shard52.zip"],
     srcs: ["*52-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 52 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 52 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5444,7 +5444,7 @@
     out: ["art-run-test-jvm-data-shard53.zip"],
     srcs: ["*53-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 53 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 53 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5462,7 +5462,7 @@
     out: ["art-run-test-jvm-data-shard54.zip"],
     srcs: ["*54-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 54 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 54 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5480,7 +5480,7 @@
     out: ["art-run-test-jvm-data-shard55.zip"],
     srcs: ["*55-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 55 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 55 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5498,7 +5498,7 @@
     out: ["art-run-test-jvm-data-shard56.zip"],
     srcs: ["*56-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 56 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 56 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5516,7 +5516,7 @@
     out: ["art-run-test-jvm-data-shard57.zip"],
     srcs: ["*57-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 57 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 57 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5534,7 +5534,7 @@
     out: ["art-run-test-jvm-data-shard58.zip"],
     srcs: ["*58-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 58 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 58 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5552,7 +5552,7 @@
     out: ["art-run-test-jvm-data-shard59.zip"],
     srcs: ["*59-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 59 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 59 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5570,7 +5570,7 @@
     out: ["art-run-test-jvm-data-shard60.zip"],
     srcs: ["*60-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 60 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 60 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5588,7 +5588,7 @@
     out: ["art-run-test-jvm-data-shard61.zip"],
     srcs: ["*61-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 61 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 61 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5606,7 +5606,7 @@
     out: ["art-run-test-jvm-data-shard62.zip"],
     srcs: ["*62-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 62 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 62 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5624,7 +5624,7 @@
     out: ["art-run-test-jvm-data-shard63.zip"],
     srcs: ["*63-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 63 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 63 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5642,7 +5642,7 @@
     out: ["art-run-test-jvm-data-shard64.zip"],
     srcs: ["*64-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 64 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 64 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5660,7 +5660,7 @@
     out: ["art-run-test-jvm-data-shard65.zip"],
     srcs: ["*65-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 65 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 65 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5678,7 +5678,7 @@
     out: ["art-run-test-jvm-data-shard66.zip"],
     srcs: ["*66-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 66 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 66 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5696,7 +5696,7 @@
     out: ["art-run-test-jvm-data-shard67.zip"],
     srcs: ["*67-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 67 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 67 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5714,7 +5714,7 @@
     out: ["art-run-test-jvm-data-shard68.zip"],
     srcs: ["*68-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 68 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 68 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5732,7 +5732,7 @@
     out: ["art-run-test-jvm-data-shard69.zip"],
     srcs: ["*69-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 69 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 69 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5750,7 +5750,7 @@
     out: ["art-run-test-jvm-data-shard70.zip"],
     srcs: ["*70-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 70 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 70 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5768,7 +5768,7 @@
     out: ["art-run-test-jvm-data-shard71.zip"],
     srcs: ["*71-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 71 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 71 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5786,7 +5786,7 @@
     out: ["art-run-test-jvm-data-shard72.zip"],
     srcs: ["*72-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 72 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 72 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5804,7 +5804,7 @@
     out: ["art-run-test-jvm-data-shard73.zip"],
     srcs: ["*73-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 73 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 73 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5822,7 +5822,7 @@
     out: ["art-run-test-jvm-data-shard74.zip"],
     srcs: ["*74-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 74 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 74 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5840,7 +5840,7 @@
     out: ["art-run-test-jvm-data-shard75.zip"],
     srcs: ["*75-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 75 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 75 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5858,7 +5858,7 @@
     out: ["art-run-test-jvm-data-shard76.zip"],
     srcs: ["*76-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 76 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 76 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5876,7 +5876,7 @@
     out: ["art-run-test-jvm-data-shard77.zip"],
     srcs: ["*77-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 77 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 77 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5894,7 +5894,7 @@
     out: ["art-run-test-jvm-data-shard78.zip"],
     srcs: ["*78-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 78 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 78 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5912,7 +5912,7 @@
     out: ["art-run-test-jvm-data-shard79.zip"],
     srcs: ["*79-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 79 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 79 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5930,7 +5930,7 @@
     out: ["art-run-test-jvm-data-shard80.zip"],
     srcs: ["*80-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 80 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 80 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5948,7 +5948,7 @@
     out: ["art-run-test-jvm-data-shard81.zip"],
     srcs: ["*81-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 81 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 81 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5966,7 +5966,7 @@
     out: ["art-run-test-jvm-data-shard82.zip"],
     srcs: ["*82-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 82 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 82 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -5984,7 +5984,7 @@
     out: ["art-run-test-jvm-data-shard83.zip"],
     srcs: ["*83-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 83 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 83 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6002,7 +6002,7 @@
     out: ["art-run-test-jvm-data-shard84.zip"],
     srcs: ["*84-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 84 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 84 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6020,7 +6020,7 @@
     out: ["art-run-test-jvm-data-shard85.zip"],
     srcs: ["*85-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 85 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 85 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6038,7 +6038,7 @@
     out: ["art-run-test-jvm-data-shard86.zip"],
     srcs: ["*86-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 86 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 86 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6056,7 +6056,7 @@
     out: ["art-run-test-jvm-data-shard87.zip"],
     srcs: ["*87-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 87 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 87 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6074,7 +6074,7 @@
     out: ["art-run-test-jvm-data-shard88.zip"],
     srcs: ["*88-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 88 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 88 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6092,7 +6092,7 @@
     out: ["art-run-test-jvm-data-shard89.zip"],
     srcs: ["*89-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 89 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 89 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6110,7 +6110,7 @@
     out: ["art-run-test-jvm-data-shard90.zip"],
     srcs: ["*90-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 90 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 90 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6128,7 +6128,7 @@
     out: ["art-run-test-jvm-data-shard91.zip"],
     srcs: ["*91-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 91 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 91 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6146,7 +6146,7 @@
     out: ["art-run-test-jvm-data-shard92.zip"],
     srcs: ["*92-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 92 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 92 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6164,7 +6164,7 @@
     out: ["art-run-test-jvm-data-shard93.zip"],
     srcs: ["*93-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 93 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 93 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6182,7 +6182,7 @@
     out: ["art-run-test-jvm-data-shard94.zip"],
     srcs: ["*94-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 94 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 94 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6200,7 +6200,7 @@
     out: ["art-run-test-jvm-data-shard95.zip"],
     srcs: ["*95-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 95 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 95 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6218,7 +6218,7 @@
     out: ["art-run-test-jvm-data-shard96.zip"],
     srcs: ["*96-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 96 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 96 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6236,7 +6236,7 @@
     out: ["art-run-test-jvm-data-shard97.zip"],
     srcs: ["*97-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 97 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 97 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6254,7 +6254,7 @@
     out: ["art-run-test-jvm-data-shard98.zip"],
     srcs: ["*98-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 98 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 98 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 
@@ -6272,7 +6272,7 @@
     out: ["art-run-test-jvm-data-shard99.zip"],
     srcs: ["*99-*/**/*"],
     defaults: ["art-run-test-data-defaults"],
-    cmd: "$(location run-test-build.py) --out $(out) --mode jvm --shard 99 " +
+    cmd: "$(location run_test_build.py) --out $(out) --mode jvm --shard 99 " +
         "--bootclasspath $(location :art-run-test-bootclasspath)",
 }
 

test/Android.run-test.bp.py

diff --git a/test/Android.run-test.bp.py b/test/Android.run-test.bp.py
index eaa093a..cb65caa 100755
--- a/test/Android.run-test.bp.py
+++ b/test/Android.run-test.bp.py
@@ -39,7 +39,7 @@
               out: ["{name}.zip"],
               srcs: ["*{shard}-*/**/*"],
               defaults: ["art-run-test-data-defaults"],
-              cmd: "$(location run-test-build.py) --out $(out) --mode {mode} --shard {shard} " +
+              cmd: "$(location run_test_build.py) --out $(out) --mode {mode} --shard {shard} " +
                   "--bootclasspath $(location :art-run-test-bootclasspath)",
           }}
 

test/run-test-build.py

diff --git a/test/run-test-build.py b/test/run-test-build.py
deleted file mode 100755
index 30a966d..0000000
--- a/test/run-test-build.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""
-This scripts compiles Java files which are needed to execute run-tests.
-It is intended to be used only from soong genrule.
-"""
-
-from argparse import ArgumentParser
-from art_build_rules import BuildTestContext, default_build
-from fcntl import lockf, LOCK_EX, LOCK_NB
-from importlib.machinery import SourceFileLoader
-from multiprocessing import Pool
-from multiprocessing.pool import ApplyResult
-from os import environ, getcwd, chdir, cpu_count
-from os.path import join, basename
-from pathlib import Path
-from re import match
-from shutil import copytree
-from subprocess import run
-from typing import Dict
-
-ZIP = "prebuilts/build-tools/linux-x86/bin/soong_zip"
-
-lock_file = None  # Keep alive as long as this process is alive.
-
-
-def copy_sources(args, ziproot: Path, mode: str, srcdir: Path) -> Path:
-  """Copy test files from Android tree into the build sandbox and return its path."""
-
-  dstdir = ziproot / mode / srcdir.name
-  copytree(srcdir, dstdir)
-  return dstdir
-
-
-def build_test(ctx: BuildTestContext) -> None:
-  """Run the build script for single run-test"""
-
-  chdir(ctx.test_dir)
-  script = ctx.test_dir / "build.py"
-  if script.exists():
-    module = SourceFileLoader("build_" + ctx.test_name,
-                              str(script)).load_module()
-    module.build(ctx)
-  else:
-    default_build(ctx)
-
-
-# If we build just individual shard, we want to split the work among all the cores,
-# but if the build system builds all shards, we don't want to overload the machine.
-# We don't know which situation we are in, so as simple work-around, we use a lock
-# file to allow only one shard to use multiprocessing at the same time.
-def use_multiprocessing(mode: str) -> bool:
-  global lock_file
-  lock_path = join(environ["TMPDIR"], "art-test-run-test-build-py-" + mode)
-  lock_file = open(lock_path, "w")
-  try:
-    lockf(lock_file, LOCK_EX | LOCK_NB)
-    return True  # We are the only instance of this script in the build system.
-  except BlockingIOError:
-    return False  # Some other instance is already running.
-
-
-def main() -> None:
-  parser = ArgumentParser(description=__doc__)
-  parser.add_argument(
-      "--out", help="Path of the generated ZIP file with the build data")
-  parser.add_argument("--mode", choices=["host", "jvm", "target"])
-  parser.add_argument(
-      "--shard", help="Identifies subset of tests to build (00..99)")
-  parser.add_argument(
-      "--bootclasspath", help="JAR files used for javac compilation")
-  args = parser.parse_args()
-
-  build_top = Path(getcwd())
-  sbox = Path(__file__).absolute().parent.parent.parent.parent.parent
-  assert sbox.parent.name == "sbox" and len(sbox.name) == 40
-
-  ziproot = sbox / "zip"
-  srcdirs = sorted(build_top.glob("art/test/*"))
-  srcdirs = [s for s in srcdirs if match("\d*{}-.*".format(args.shard), s.name)]
-  dstdirs = [copy_sources(args, ziproot, args.mode, s) for s in srcdirs]
-
-  # Use multiprocessing (i.e. forking) since tests modify their current working directory.
-  with Pool(cpu_count() if use_multiprocessing(args.mode) else 1) as pool:
-    jobs: Dict[Path, ApplyResult] = {}
-    for dstdir in dstdirs:
-      ctx = BuildTestContext(args, build_top, sbox, dstdir.name, dstdir)
-      jobs[dstdir] = pool.apply_async(build_test, (ctx,))
-    for dstdir, job in jobs.items():
-      try:
-        job.get()
-      except Exception as e:
-        raise Exception("Failed to build " + dstdir.name) from e.__cause__
-
-  # Create the final zip file which contains the content of the temporary directory.
-  proc = run([ZIP, "-o", args.out, "-C", ziproot, "-D", ziproot], check=True)
-
-
-if __name__ == "__main__":
-  main()

test/run_test_build.py

diff --git a/test/art_build_rules.py b/test/run_test_build.py
old mode 100644
new mode 100755
similarity index 83%
rename from test/art_build_rules.py
rename to test/run_test_build.py
index bd954d2..aa3a053
--- a/test/art_build_rules.py
+++ b/test/run_test_build.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 #
 # Copyright (C) 2021 The Android Open Source Project
 #
@@ -13,29 +14,39 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This is the default build script for run-tests.
-
-It can be overwrite by specific run-tests if needed.
-It is used from soong build and not intended to be called directly.
+"""
+This scripts compiles Java files which are needed to execute run-tests.
+It is intended to be used only from soong genrule.
 """
 
 import argparse
 import functools
 import glob
 import os
-from os import path
 import shlex
 import shutil
 import subprocess
 import tempfile
 import zipfile
-from shutil import rmtree
-from os import remove
+from argparse import ArgumentParser
+from fcntl import lockf, LOCK_EX, LOCK_NB
+from importlib.machinery import SourceFileLoader
+from multiprocessing import Pool
+from multiprocessing.pool import ApplyResult
+from os import environ, getcwd, chdir, cpu_count, remove, path
+from os.path import join, basename
+from pathlib import Path
 from re import match
-from os.path import join
+from shutil import copytree, rmtree
+from subprocess import run
+from typing import Dict
 
 USE_RBE_FOR_JAVAC = 100    # Percentage of tests that can use RBE (between 0 and 100)
 USE_RBE_FOR_D8 = 100       # Percentage of tests that can use RBE (between 0 and 100)
+ZIP = "prebuilts/build-tools/linux-x86/bin/soong_zip"
+
+lock_file = None  # Keep alive as long as this process is alive.
+
 
 class BuildTestContext:
   def __init__(self, args, build_top, sbox, test_name, test_dir):
@@ -497,3 +508,79 @@
       zip(TEST_NAME + ".jar", "classes.dex", "classes2.dex")
     else:
       zip(TEST_NAME + ".jar", "classes.dex")
+
+
+def copy_sources(args, ziproot: Path, mode: str, srcdir: Path) -> Path:
+  """Copy test files from Android tree into the build sandbox and return its path."""
+
+  dstdir = ziproot / mode / srcdir.name
+  copytree(srcdir, dstdir)
+  return dstdir
+
+
+def build_test(ctx: BuildTestContext) -> None:
+  """Run the build script for single run-test"""
+
+  chdir(ctx.test_dir)
+  script = ctx.test_dir / "build.py"
+  if script.exists():
+    module = SourceFileLoader("build_" + ctx.test_name,
+                              str(script)).load_module()
+    module.build(ctx)
+  else:
+    default_build(ctx)
+
+
+# If we build just individual shard, we want to split the work among all the cores,
+# but if the build system builds all shards, we don't want to overload the machine.
+# We don't know which situation we are in, so as simple work-around, we use a lock
+# file to allow only one shard to use multiprocessing at the same time.
+def use_multiprocessing(mode: str) -> bool:
+  global lock_file
+  lock_path = join(environ["TMPDIR"], "art-test-run-test-build-py-" + mode)
+  lock_file = open(lock_path, "w")
+  try:
+    lockf(lock_file, LOCK_EX | LOCK_NB)
+    return True  # We are the only instance of this script in the build system.
+  except BlockingIOError:
+    return False  # Some other instance is already running.
+
+
+def main() -> None:
+  parser = ArgumentParser(description=__doc__)
+  parser.add_argument(
+      "--out", help="Path of the generated ZIP file with the build data")
+  parser.add_argument("--mode", choices=["host", "jvm", "target"])
+  parser.add_argument(
+      "--shard", help="Identifies subset of tests to build (00..99)")
+  parser.add_argument(
+      "--bootclasspath", help="JAR files used for javac compilation")
+  args = parser.parse_args()
+
+  build_top = Path(getcwd())
+  sbox = Path(__file__).absolute().parent.parent.parent.parent.parent
+  assert sbox.parent.name == "sbox" and len(sbox.name) == 40
+
+  ziproot = sbox / "zip"
+  srcdirs = sorted(build_top.glob("art/test/*"))
+  srcdirs = [s for s in srcdirs if match("\d*{}-.*".format(args.shard), s.name)]
+  dstdirs = [copy_sources(args, ziproot, args.mode, s) for s in srcdirs]
+
+  # Use multiprocessing (i.e. forking) since tests modify their current working directory.
+  with Pool(cpu_count() if use_multiprocessing(args.mode) else 1) as pool:
+    jobs: Dict[Path, ApplyResult] = {}
+    for dstdir in dstdirs:
+      ctx = BuildTestContext(args, build_top, sbox, dstdir.name, dstdir)
+      jobs[dstdir] = pool.apply_async(build_test, (ctx,))
+    for dstdir, job in jobs.items():
+      try:
+        job.get()
+      except Exception as e:
+        raise Exception("Failed to build " + dstdir.name) from e.__cause__
+
+  # Create the final zip file which contains the content of the temporary directory.
+  proc = run([ZIP, "-o", args.out, "-C", ziproot, "-D", ziproot], check=True)
+
+
+if __name__ == "__main__":
+  main()