Run-tests: Fix mac build

Revert one of the trivial changes from previous CL.

Change-Id: I7bc4d93cbdf09f7b73ddac5afcab3c3a41c83ede
diff --git a/test/Android.run-test.bp b/test/Android.run-test.bp
index 3be3d94..125fa06 100644
--- a/test/Android.run-test.bp
+++ b/test/Android.run-test.bp
@@ -1,7 +1,7 @@
 // This file was generated by Android.run-test.bp.py
 // It is not necessary to regenerate it when tests are added/removed/modified.
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard00-tmp",
     out: ["art-run-test-host-data-shard00.zip"],
     srcs: ["?00-*/**/*", "??00-*/**/*"],
@@ -17,7 +17,7 @@
     filename: "art-run-test-host-data-shard00.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard01-tmp",
     out: ["art-run-test-host-data-shard01.zip"],
     srcs: ["?01-*/**/*", "??01-*/**/*"],
@@ -33,7 +33,7 @@
     filename: "art-run-test-host-data-shard01.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard02-tmp",
     out: ["art-run-test-host-data-shard02.zip"],
     srcs: ["?02-*/**/*", "??02-*/**/*"],
@@ -49,7 +49,7 @@
     filename: "art-run-test-host-data-shard02.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard03-tmp",
     out: ["art-run-test-host-data-shard03.zip"],
     srcs: ["?03-*/**/*", "??03-*/**/*"],
@@ -65,7 +65,7 @@
     filename: "art-run-test-host-data-shard03.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard04-tmp",
     out: ["art-run-test-host-data-shard04.zip"],
     srcs: ["?04-*/**/*", "??04-*/**/*"],
@@ -81,7 +81,7 @@
     filename: "art-run-test-host-data-shard04.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard05-tmp",
     out: ["art-run-test-host-data-shard05.zip"],
     srcs: ["?05-*/**/*", "??05-*/**/*"],
@@ -97,7 +97,7 @@
     filename: "art-run-test-host-data-shard05.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard06-tmp",
     out: ["art-run-test-host-data-shard06.zip"],
     srcs: ["?06-*/**/*", "??06-*/**/*"],
@@ -113,7 +113,7 @@
     filename: "art-run-test-host-data-shard06.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard07-tmp",
     out: ["art-run-test-host-data-shard07.zip"],
     srcs: ["?07-*/**/*", "??07-*/**/*"],
@@ -129,7 +129,7 @@
     filename: "art-run-test-host-data-shard07.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard08-tmp",
     out: ["art-run-test-host-data-shard08.zip"],
     srcs: ["?08-*/**/*", "??08-*/**/*"],
@@ -145,7 +145,7 @@
     filename: "art-run-test-host-data-shard08.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard09-tmp",
     out: ["art-run-test-host-data-shard09.zip"],
     srcs: ["?09-*/**/*", "??09-*/**/*"],
@@ -161,7 +161,7 @@
     filename: "art-run-test-host-data-shard09.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard10-tmp",
     out: ["art-run-test-host-data-shard10.zip"],
     srcs: ["?10-*/**/*", "??10-*/**/*"],
@@ -177,7 +177,7 @@
     filename: "art-run-test-host-data-shard10.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard11-tmp",
     out: ["art-run-test-host-data-shard11.zip"],
     srcs: ["?11-*/**/*", "??11-*/**/*"],
@@ -193,7 +193,7 @@
     filename: "art-run-test-host-data-shard11.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard12-tmp",
     out: ["art-run-test-host-data-shard12.zip"],
     srcs: ["?12-*/**/*", "??12-*/**/*"],
@@ -209,7 +209,7 @@
     filename: "art-run-test-host-data-shard12.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard13-tmp",
     out: ["art-run-test-host-data-shard13.zip"],
     srcs: ["?13-*/**/*", "??13-*/**/*"],
@@ -225,7 +225,7 @@
     filename: "art-run-test-host-data-shard13.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard14-tmp",
     out: ["art-run-test-host-data-shard14.zip"],
     srcs: ["?14-*/**/*", "??14-*/**/*"],
@@ -241,7 +241,7 @@
     filename: "art-run-test-host-data-shard14.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard15-tmp",
     out: ["art-run-test-host-data-shard15.zip"],
     srcs: ["?15-*/**/*", "??15-*/**/*"],
@@ -257,7 +257,7 @@
     filename: "art-run-test-host-data-shard15.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard16-tmp",
     out: ["art-run-test-host-data-shard16.zip"],
     srcs: ["?16-*/**/*", "??16-*/**/*"],
@@ -273,7 +273,7 @@
     filename: "art-run-test-host-data-shard16.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard17-tmp",
     out: ["art-run-test-host-data-shard17.zip"],
     srcs: ["?17-*/**/*", "??17-*/**/*"],
@@ -289,7 +289,7 @@
     filename: "art-run-test-host-data-shard17.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard18-tmp",
     out: ["art-run-test-host-data-shard18.zip"],
     srcs: ["?18-*/**/*", "??18-*/**/*"],
@@ -305,7 +305,7 @@
     filename: "art-run-test-host-data-shard18.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard19-tmp",
     out: ["art-run-test-host-data-shard19.zip"],
     srcs: ["?19-*/**/*", "??19-*/**/*"],
@@ -321,7 +321,7 @@
     filename: "art-run-test-host-data-shard19.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard20-tmp",
     out: ["art-run-test-host-data-shard20.zip"],
     srcs: ["?20-*/**/*", "??20-*/**/*"],
@@ -337,7 +337,7 @@
     filename: "art-run-test-host-data-shard20.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard21-tmp",
     out: ["art-run-test-host-data-shard21.zip"],
     srcs: ["?21-*/**/*", "??21-*/**/*"],
@@ -353,7 +353,7 @@
     filename: "art-run-test-host-data-shard21.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard22-tmp",
     out: ["art-run-test-host-data-shard22.zip"],
     srcs: ["?22-*/**/*", "??22-*/**/*"],
@@ -369,7 +369,7 @@
     filename: "art-run-test-host-data-shard22.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard23-tmp",
     out: ["art-run-test-host-data-shard23.zip"],
     srcs: ["?23-*/**/*", "??23-*/**/*"],
@@ -385,7 +385,7 @@
     filename: "art-run-test-host-data-shard23.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard24-tmp",
     out: ["art-run-test-host-data-shard24.zip"],
     srcs: ["?24-*/**/*", "??24-*/**/*"],
@@ -401,7 +401,7 @@
     filename: "art-run-test-host-data-shard24.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard25-tmp",
     out: ["art-run-test-host-data-shard25.zip"],
     srcs: ["?25-*/**/*", "??25-*/**/*"],
@@ -417,7 +417,7 @@
     filename: "art-run-test-host-data-shard25.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard26-tmp",
     out: ["art-run-test-host-data-shard26.zip"],
     srcs: ["?26-*/**/*", "??26-*/**/*"],
@@ -433,7 +433,7 @@
     filename: "art-run-test-host-data-shard26.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard27-tmp",
     out: ["art-run-test-host-data-shard27.zip"],
     srcs: ["?27-*/**/*", "??27-*/**/*"],
@@ -449,7 +449,7 @@
     filename: "art-run-test-host-data-shard27.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard28-tmp",
     out: ["art-run-test-host-data-shard28.zip"],
     srcs: ["?28-*/**/*", "??28-*/**/*"],
@@ -465,7 +465,7 @@
     filename: "art-run-test-host-data-shard28.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard29-tmp",
     out: ["art-run-test-host-data-shard29.zip"],
     srcs: ["?29-*/**/*", "??29-*/**/*"],
@@ -481,7 +481,7 @@
     filename: "art-run-test-host-data-shard29.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard30-tmp",
     out: ["art-run-test-host-data-shard30.zip"],
     srcs: ["?30-*/**/*", "??30-*/**/*"],
@@ -497,7 +497,7 @@
     filename: "art-run-test-host-data-shard30.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard31-tmp",
     out: ["art-run-test-host-data-shard31.zip"],
     srcs: ["?31-*/**/*", "??31-*/**/*"],
@@ -513,7 +513,7 @@
     filename: "art-run-test-host-data-shard31.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard32-tmp",
     out: ["art-run-test-host-data-shard32.zip"],
     srcs: ["?32-*/**/*", "??32-*/**/*"],
@@ -529,7 +529,7 @@
     filename: "art-run-test-host-data-shard32.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard33-tmp",
     out: ["art-run-test-host-data-shard33.zip"],
     srcs: ["?33-*/**/*", "??33-*/**/*"],
@@ -545,7 +545,7 @@
     filename: "art-run-test-host-data-shard33.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard34-tmp",
     out: ["art-run-test-host-data-shard34.zip"],
     srcs: ["?34-*/**/*", "??34-*/**/*"],
@@ -561,7 +561,7 @@
     filename: "art-run-test-host-data-shard34.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard35-tmp",
     out: ["art-run-test-host-data-shard35.zip"],
     srcs: ["?35-*/**/*", "??35-*/**/*"],
@@ -577,7 +577,7 @@
     filename: "art-run-test-host-data-shard35.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard36-tmp",
     out: ["art-run-test-host-data-shard36.zip"],
     srcs: ["?36-*/**/*", "??36-*/**/*"],
@@ -593,7 +593,7 @@
     filename: "art-run-test-host-data-shard36.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard37-tmp",
     out: ["art-run-test-host-data-shard37.zip"],
     srcs: ["?37-*/**/*", "??37-*/**/*"],
@@ -609,7 +609,7 @@
     filename: "art-run-test-host-data-shard37.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard38-tmp",
     out: ["art-run-test-host-data-shard38.zip"],
     srcs: ["?38-*/**/*", "??38-*/**/*"],
@@ -625,7 +625,7 @@
     filename: "art-run-test-host-data-shard38.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard39-tmp",
     out: ["art-run-test-host-data-shard39.zip"],
     srcs: ["?39-*/**/*", "??39-*/**/*"],
@@ -641,7 +641,7 @@
     filename: "art-run-test-host-data-shard39.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard40-tmp",
     out: ["art-run-test-host-data-shard40.zip"],
     srcs: ["?40-*/**/*", "??40-*/**/*"],
@@ -657,7 +657,7 @@
     filename: "art-run-test-host-data-shard40.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard41-tmp",
     out: ["art-run-test-host-data-shard41.zip"],
     srcs: ["?41-*/**/*", "??41-*/**/*"],
@@ -673,7 +673,7 @@
     filename: "art-run-test-host-data-shard41.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard42-tmp",
     out: ["art-run-test-host-data-shard42.zip"],
     srcs: ["?42-*/**/*", "??42-*/**/*"],
@@ -689,7 +689,7 @@
     filename: "art-run-test-host-data-shard42.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard43-tmp",
     out: ["art-run-test-host-data-shard43.zip"],
     srcs: ["?43-*/**/*", "??43-*/**/*"],
@@ -705,7 +705,7 @@
     filename: "art-run-test-host-data-shard43.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard44-tmp",
     out: ["art-run-test-host-data-shard44.zip"],
     srcs: ["?44-*/**/*", "??44-*/**/*"],
@@ -721,7 +721,7 @@
     filename: "art-run-test-host-data-shard44.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard45-tmp",
     out: ["art-run-test-host-data-shard45.zip"],
     srcs: ["?45-*/**/*", "??45-*/**/*"],
@@ -737,7 +737,7 @@
     filename: "art-run-test-host-data-shard45.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard46-tmp",
     out: ["art-run-test-host-data-shard46.zip"],
     srcs: ["?46-*/**/*", "??46-*/**/*"],
@@ -753,7 +753,7 @@
     filename: "art-run-test-host-data-shard46.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard47-tmp",
     out: ["art-run-test-host-data-shard47.zip"],
     srcs: ["?47-*/**/*", "??47-*/**/*"],
@@ -769,7 +769,7 @@
     filename: "art-run-test-host-data-shard47.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard48-tmp",
     out: ["art-run-test-host-data-shard48.zip"],
     srcs: ["?48-*/**/*", "??48-*/**/*"],
@@ -785,7 +785,7 @@
     filename: "art-run-test-host-data-shard48.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard49-tmp",
     out: ["art-run-test-host-data-shard49.zip"],
     srcs: ["?49-*/**/*", "??49-*/**/*"],
@@ -801,7 +801,7 @@
     filename: "art-run-test-host-data-shard49.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard50-tmp",
     out: ["art-run-test-host-data-shard50.zip"],
     srcs: ["?50-*/**/*", "??50-*/**/*"],
@@ -817,7 +817,7 @@
     filename: "art-run-test-host-data-shard50.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard51-tmp",
     out: ["art-run-test-host-data-shard51.zip"],
     srcs: ["?51-*/**/*", "??51-*/**/*"],
@@ -833,7 +833,7 @@
     filename: "art-run-test-host-data-shard51.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard52-tmp",
     out: ["art-run-test-host-data-shard52.zip"],
     srcs: ["?52-*/**/*", "??52-*/**/*"],
@@ -849,7 +849,7 @@
     filename: "art-run-test-host-data-shard52.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard53-tmp",
     out: ["art-run-test-host-data-shard53.zip"],
     srcs: ["?53-*/**/*", "??53-*/**/*"],
@@ -865,7 +865,7 @@
     filename: "art-run-test-host-data-shard53.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard54-tmp",
     out: ["art-run-test-host-data-shard54.zip"],
     srcs: ["?54-*/**/*", "??54-*/**/*"],
@@ -881,7 +881,7 @@
     filename: "art-run-test-host-data-shard54.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard55-tmp",
     out: ["art-run-test-host-data-shard55.zip"],
     srcs: ["?55-*/**/*", "??55-*/**/*"],
@@ -897,7 +897,7 @@
     filename: "art-run-test-host-data-shard55.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard56-tmp",
     out: ["art-run-test-host-data-shard56.zip"],
     srcs: ["?56-*/**/*", "??56-*/**/*"],
@@ -913,7 +913,7 @@
     filename: "art-run-test-host-data-shard56.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard57-tmp",
     out: ["art-run-test-host-data-shard57.zip"],
     srcs: ["?57-*/**/*", "??57-*/**/*"],
@@ -929,7 +929,7 @@
     filename: "art-run-test-host-data-shard57.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard58-tmp",
     out: ["art-run-test-host-data-shard58.zip"],
     srcs: ["?58-*/**/*", "??58-*/**/*"],
@@ -945,7 +945,7 @@
     filename: "art-run-test-host-data-shard58.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard59-tmp",
     out: ["art-run-test-host-data-shard59.zip"],
     srcs: ["?59-*/**/*", "??59-*/**/*"],
@@ -961,7 +961,7 @@
     filename: "art-run-test-host-data-shard59.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard60-tmp",
     out: ["art-run-test-host-data-shard60.zip"],
     srcs: ["?60-*/**/*", "??60-*/**/*"],
@@ -977,7 +977,7 @@
     filename: "art-run-test-host-data-shard60.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard61-tmp",
     out: ["art-run-test-host-data-shard61.zip"],
     srcs: ["?61-*/**/*", "??61-*/**/*"],
@@ -993,7 +993,7 @@
     filename: "art-run-test-host-data-shard61.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard62-tmp",
     out: ["art-run-test-host-data-shard62.zip"],
     srcs: ["?62-*/**/*", "??62-*/**/*"],
@@ -1009,7 +1009,7 @@
     filename: "art-run-test-host-data-shard62.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard63-tmp",
     out: ["art-run-test-host-data-shard63.zip"],
     srcs: ["?63-*/**/*", "??63-*/**/*"],
@@ -1025,7 +1025,7 @@
     filename: "art-run-test-host-data-shard63.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard64-tmp",
     out: ["art-run-test-host-data-shard64.zip"],
     srcs: ["?64-*/**/*", "??64-*/**/*"],
@@ -1041,7 +1041,7 @@
     filename: "art-run-test-host-data-shard64.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard65-tmp",
     out: ["art-run-test-host-data-shard65.zip"],
     srcs: ["?65-*/**/*", "??65-*/**/*"],
@@ -1057,7 +1057,7 @@
     filename: "art-run-test-host-data-shard65.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard66-tmp",
     out: ["art-run-test-host-data-shard66.zip"],
     srcs: ["?66-*/**/*", "??66-*/**/*"],
@@ -1073,7 +1073,7 @@
     filename: "art-run-test-host-data-shard66.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard67-tmp",
     out: ["art-run-test-host-data-shard67.zip"],
     srcs: ["?67-*/**/*", "??67-*/**/*"],
@@ -1089,7 +1089,7 @@
     filename: "art-run-test-host-data-shard67.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard68-tmp",
     out: ["art-run-test-host-data-shard68.zip"],
     srcs: ["?68-*/**/*", "??68-*/**/*"],
@@ -1105,7 +1105,7 @@
     filename: "art-run-test-host-data-shard68.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard69-tmp",
     out: ["art-run-test-host-data-shard69.zip"],
     srcs: ["?69-*/**/*", "??69-*/**/*"],
@@ -1121,7 +1121,7 @@
     filename: "art-run-test-host-data-shard69.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard70-tmp",
     out: ["art-run-test-host-data-shard70.zip"],
     srcs: ["?70-*/**/*", "??70-*/**/*"],
@@ -1137,7 +1137,7 @@
     filename: "art-run-test-host-data-shard70.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard71-tmp",
     out: ["art-run-test-host-data-shard71.zip"],
     srcs: ["?71-*/**/*", "??71-*/**/*"],
@@ -1153,7 +1153,7 @@
     filename: "art-run-test-host-data-shard71.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard72-tmp",
     out: ["art-run-test-host-data-shard72.zip"],
     srcs: ["?72-*/**/*", "??72-*/**/*"],
@@ -1169,7 +1169,7 @@
     filename: "art-run-test-host-data-shard72.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard73-tmp",
     out: ["art-run-test-host-data-shard73.zip"],
     srcs: ["?73-*/**/*", "??73-*/**/*"],
@@ -1185,7 +1185,7 @@
     filename: "art-run-test-host-data-shard73.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard74-tmp",
     out: ["art-run-test-host-data-shard74.zip"],
     srcs: ["?74-*/**/*", "??74-*/**/*"],
@@ -1201,7 +1201,7 @@
     filename: "art-run-test-host-data-shard74.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard75-tmp",
     out: ["art-run-test-host-data-shard75.zip"],
     srcs: ["?75-*/**/*", "??75-*/**/*"],
@@ -1217,7 +1217,7 @@
     filename: "art-run-test-host-data-shard75.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard76-tmp",
     out: ["art-run-test-host-data-shard76.zip"],
     srcs: ["?76-*/**/*", "??76-*/**/*"],
@@ -1233,7 +1233,7 @@
     filename: "art-run-test-host-data-shard76.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard77-tmp",
     out: ["art-run-test-host-data-shard77.zip"],
     srcs: ["?77-*/**/*", "??77-*/**/*"],
@@ -1249,7 +1249,7 @@
     filename: "art-run-test-host-data-shard77.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard78-tmp",
     out: ["art-run-test-host-data-shard78.zip"],
     srcs: ["?78-*/**/*", "??78-*/**/*"],
@@ -1265,7 +1265,7 @@
     filename: "art-run-test-host-data-shard78.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard79-tmp",
     out: ["art-run-test-host-data-shard79.zip"],
     srcs: ["?79-*/**/*", "??79-*/**/*"],
@@ -1281,7 +1281,7 @@
     filename: "art-run-test-host-data-shard79.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard80-tmp",
     out: ["art-run-test-host-data-shard80.zip"],
     srcs: ["?80-*/**/*", "??80-*/**/*"],
@@ -1297,7 +1297,7 @@
     filename: "art-run-test-host-data-shard80.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard81-tmp",
     out: ["art-run-test-host-data-shard81.zip"],
     srcs: ["?81-*/**/*", "??81-*/**/*"],
@@ -1313,7 +1313,7 @@
     filename: "art-run-test-host-data-shard81.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard82-tmp",
     out: ["art-run-test-host-data-shard82.zip"],
     srcs: ["?82-*/**/*", "??82-*/**/*"],
@@ -1329,7 +1329,7 @@
     filename: "art-run-test-host-data-shard82.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard83-tmp",
     out: ["art-run-test-host-data-shard83.zip"],
     srcs: ["?83-*/**/*", "??83-*/**/*"],
@@ -1345,7 +1345,7 @@
     filename: "art-run-test-host-data-shard83.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard84-tmp",
     out: ["art-run-test-host-data-shard84.zip"],
     srcs: ["?84-*/**/*", "??84-*/**/*"],
@@ -1361,7 +1361,7 @@
     filename: "art-run-test-host-data-shard84.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard85-tmp",
     out: ["art-run-test-host-data-shard85.zip"],
     srcs: ["?85-*/**/*", "??85-*/**/*"],
@@ -1377,7 +1377,7 @@
     filename: "art-run-test-host-data-shard85.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard86-tmp",
     out: ["art-run-test-host-data-shard86.zip"],
     srcs: ["?86-*/**/*", "??86-*/**/*"],
@@ -1393,7 +1393,7 @@
     filename: "art-run-test-host-data-shard86.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard87-tmp",
     out: ["art-run-test-host-data-shard87.zip"],
     srcs: ["?87-*/**/*", "??87-*/**/*"],
@@ -1409,7 +1409,7 @@
     filename: "art-run-test-host-data-shard87.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard88-tmp",
     out: ["art-run-test-host-data-shard88.zip"],
     srcs: ["?88-*/**/*", "??88-*/**/*"],
@@ -1425,7 +1425,7 @@
     filename: "art-run-test-host-data-shard88.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard89-tmp",
     out: ["art-run-test-host-data-shard89.zip"],
     srcs: ["?89-*/**/*", "??89-*/**/*"],
@@ -1441,7 +1441,7 @@
     filename: "art-run-test-host-data-shard89.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard90-tmp",
     out: ["art-run-test-host-data-shard90.zip"],
     srcs: ["?90-*/**/*", "??90-*/**/*"],
@@ -1457,7 +1457,7 @@
     filename: "art-run-test-host-data-shard90.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard91-tmp",
     out: ["art-run-test-host-data-shard91.zip"],
     srcs: ["?91-*/**/*", "??91-*/**/*"],
@@ -1473,7 +1473,7 @@
     filename: "art-run-test-host-data-shard91.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard92-tmp",
     out: ["art-run-test-host-data-shard92.zip"],
     srcs: ["?92-*/**/*", "??92-*/**/*"],
@@ -1489,7 +1489,7 @@
     filename: "art-run-test-host-data-shard92.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard93-tmp",
     out: ["art-run-test-host-data-shard93.zip"],
     srcs: ["?93-*/**/*", "??93-*/**/*"],
@@ -1505,7 +1505,7 @@
     filename: "art-run-test-host-data-shard93.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard94-tmp",
     out: ["art-run-test-host-data-shard94.zip"],
     srcs: ["?94-*/**/*", "??94-*/**/*"],
@@ -1521,7 +1521,7 @@
     filename: "art-run-test-host-data-shard94.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard95-tmp",
     out: ["art-run-test-host-data-shard95.zip"],
     srcs: ["?95-*/**/*", "??95-*/**/*"],
@@ -1537,7 +1537,7 @@
     filename: "art-run-test-host-data-shard95.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard96-tmp",
     out: ["art-run-test-host-data-shard96.zip"],
     srcs: ["?96-*/**/*", "??96-*/**/*"],
@@ -1553,7 +1553,7 @@
     filename: "art-run-test-host-data-shard96.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard97-tmp",
     out: ["art-run-test-host-data-shard97.zip"],
     srcs: ["?97-*/**/*", "??97-*/**/*"],
@@ -1569,7 +1569,7 @@
     filename: "art-run-test-host-data-shard97.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard98-tmp",
     out: ["art-run-test-host-data-shard98.zip"],
     srcs: ["?98-*/**/*", "??98-*/**/*"],
@@ -1585,7 +1585,7 @@
     filename: "art-run-test-host-data-shard98.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-shard99-tmp",
     out: ["art-run-test-host-data-shard99.zip"],
     srcs: ["?99-*/**/*", "??99-*/**/*"],
@@ -1631,7 +1631,7 @@
          "$(in)",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-merged-tmp",
     defaults: ["art_module_source_build_genrule_defaults"],
     out: ["art-run-test-host-data-merged.zip"],
@@ -1853,7 +1853,7 @@
 }
 
 // Phony target used to build all shards
-java_genrule_host {
+java_genrule {
     name: "art-run-test-host-data-tmp",
     defaults: ["art-run-test-data-defaults"],
     out: ["art-run-test-host-data.txt"],
@@ -2073,7 +2073,7 @@
     filename: "art-run-test-host-data.txt",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard00-tmp",
     out: ["art-run-test-target-data-shard00.zip"],
     srcs: ["?00-*/**/*", "??00-*/**/*"],
@@ -2089,7 +2089,7 @@
     filename: "art-run-test-target-data-shard00.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard01-tmp",
     out: ["art-run-test-target-data-shard01.zip"],
     srcs: ["?01-*/**/*", "??01-*/**/*"],
@@ -2105,7 +2105,7 @@
     filename: "art-run-test-target-data-shard01.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard02-tmp",
     out: ["art-run-test-target-data-shard02.zip"],
     srcs: ["?02-*/**/*", "??02-*/**/*"],
@@ -2121,7 +2121,7 @@
     filename: "art-run-test-target-data-shard02.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard03-tmp",
     out: ["art-run-test-target-data-shard03.zip"],
     srcs: ["?03-*/**/*", "??03-*/**/*"],
@@ -2137,7 +2137,7 @@
     filename: "art-run-test-target-data-shard03.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard04-tmp",
     out: ["art-run-test-target-data-shard04.zip"],
     srcs: ["?04-*/**/*", "??04-*/**/*"],
@@ -2153,7 +2153,7 @@
     filename: "art-run-test-target-data-shard04.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard05-tmp",
     out: ["art-run-test-target-data-shard05.zip"],
     srcs: ["?05-*/**/*", "??05-*/**/*"],
@@ -2169,7 +2169,7 @@
     filename: "art-run-test-target-data-shard05.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard06-tmp",
     out: ["art-run-test-target-data-shard06.zip"],
     srcs: ["?06-*/**/*", "??06-*/**/*"],
@@ -2185,7 +2185,7 @@
     filename: "art-run-test-target-data-shard06.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard07-tmp",
     out: ["art-run-test-target-data-shard07.zip"],
     srcs: ["?07-*/**/*", "??07-*/**/*"],
@@ -2201,7 +2201,7 @@
     filename: "art-run-test-target-data-shard07.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard08-tmp",
     out: ["art-run-test-target-data-shard08.zip"],
     srcs: ["?08-*/**/*", "??08-*/**/*"],
@@ -2217,7 +2217,7 @@
     filename: "art-run-test-target-data-shard08.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard09-tmp",
     out: ["art-run-test-target-data-shard09.zip"],
     srcs: ["?09-*/**/*", "??09-*/**/*"],
@@ -2233,7 +2233,7 @@
     filename: "art-run-test-target-data-shard09.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard10-tmp",
     out: ["art-run-test-target-data-shard10.zip"],
     srcs: ["?10-*/**/*", "??10-*/**/*"],
@@ -2249,7 +2249,7 @@
     filename: "art-run-test-target-data-shard10.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard11-tmp",
     out: ["art-run-test-target-data-shard11.zip"],
     srcs: ["?11-*/**/*", "??11-*/**/*"],
@@ -2265,7 +2265,7 @@
     filename: "art-run-test-target-data-shard11.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard12-tmp",
     out: ["art-run-test-target-data-shard12.zip"],
     srcs: ["?12-*/**/*", "??12-*/**/*"],
@@ -2281,7 +2281,7 @@
     filename: "art-run-test-target-data-shard12.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard13-tmp",
     out: ["art-run-test-target-data-shard13.zip"],
     srcs: ["?13-*/**/*", "??13-*/**/*"],
@@ -2297,7 +2297,7 @@
     filename: "art-run-test-target-data-shard13.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard14-tmp",
     out: ["art-run-test-target-data-shard14.zip"],
     srcs: ["?14-*/**/*", "??14-*/**/*"],
@@ -2313,7 +2313,7 @@
     filename: "art-run-test-target-data-shard14.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard15-tmp",
     out: ["art-run-test-target-data-shard15.zip"],
     srcs: ["?15-*/**/*", "??15-*/**/*"],
@@ -2329,7 +2329,7 @@
     filename: "art-run-test-target-data-shard15.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard16-tmp",
     out: ["art-run-test-target-data-shard16.zip"],
     srcs: ["?16-*/**/*", "??16-*/**/*"],
@@ -2345,7 +2345,7 @@
     filename: "art-run-test-target-data-shard16.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard17-tmp",
     out: ["art-run-test-target-data-shard17.zip"],
     srcs: ["?17-*/**/*", "??17-*/**/*"],
@@ -2361,7 +2361,7 @@
     filename: "art-run-test-target-data-shard17.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard18-tmp",
     out: ["art-run-test-target-data-shard18.zip"],
     srcs: ["?18-*/**/*", "??18-*/**/*"],
@@ -2377,7 +2377,7 @@
     filename: "art-run-test-target-data-shard18.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard19-tmp",
     out: ["art-run-test-target-data-shard19.zip"],
     srcs: ["?19-*/**/*", "??19-*/**/*"],
@@ -2393,7 +2393,7 @@
     filename: "art-run-test-target-data-shard19.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard20-tmp",
     out: ["art-run-test-target-data-shard20.zip"],
     srcs: ["?20-*/**/*", "??20-*/**/*"],
@@ -2409,7 +2409,7 @@
     filename: "art-run-test-target-data-shard20.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard21-tmp",
     out: ["art-run-test-target-data-shard21.zip"],
     srcs: ["?21-*/**/*", "??21-*/**/*"],
@@ -2425,7 +2425,7 @@
     filename: "art-run-test-target-data-shard21.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard22-tmp",
     out: ["art-run-test-target-data-shard22.zip"],
     srcs: ["?22-*/**/*", "??22-*/**/*"],
@@ -2441,7 +2441,7 @@
     filename: "art-run-test-target-data-shard22.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard23-tmp",
     out: ["art-run-test-target-data-shard23.zip"],
     srcs: ["?23-*/**/*", "??23-*/**/*"],
@@ -2457,7 +2457,7 @@
     filename: "art-run-test-target-data-shard23.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard24-tmp",
     out: ["art-run-test-target-data-shard24.zip"],
     srcs: ["?24-*/**/*", "??24-*/**/*"],
@@ -2473,7 +2473,7 @@
     filename: "art-run-test-target-data-shard24.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard25-tmp",
     out: ["art-run-test-target-data-shard25.zip"],
     srcs: ["?25-*/**/*", "??25-*/**/*"],
@@ -2489,7 +2489,7 @@
     filename: "art-run-test-target-data-shard25.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard26-tmp",
     out: ["art-run-test-target-data-shard26.zip"],
     srcs: ["?26-*/**/*", "??26-*/**/*"],
@@ -2505,7 +2505,7 @@
     filename: "art-run-test-target-data-shard26.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard27-tmp",
     out: ["art-run-test-target-data-shard27.zip"],
     srcs: ["?27-*/**/*", "??27-*/**/*"],
@@ -2521,7 +2521,7 @@
     filename: "art-run-test-target-data-shard27.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard28-tmp",
     out: ["art-run-test-target-data-shard28.zip"],
     srcs: ["?28-*/**/*", "??28-*/**/*"],
@@ -2537,7 +2537,7 @@
     filename: "art-run-test-target-data-shard28.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard29-tmp",
     out: ["art-run-test-target-data-shard29.zip"],
     srcs: ["?29-*/**/*", "??29-*/**/*"],
@@ -2553,7 +2553,7 @@
     filename: "art-run-test-target-data-shard29.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard30-tmp",
     out: ["art-run-test-target-data-shard30.zip"],
     srcs: ["?30-*/**/*", "??30-*/**/*"],
@@ -2569,7 +2569,7 @@
     filename: "art-run-test-target-data-shard30.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard31-tmp",
     out: ["art-run-test-target-data-shard31.zip"],
     srcs: ["?31-*/**/*", "??31-*/**/*"],
@@ -2585,7 +2585,7 @@
     filename: "art-run-test-target-data-shard31.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard32-tmp",
     out: ["art-run-test-target-data-shard32.zip"],
     srcs: ["?32-*/**/*", "??32-*/**/*"],
@@ -2601,7 +2601,7 @@
     filename: "art-run-test-target-data-shard32.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard33-tmp",
     out: ["art-run-test-target-data-shard33.zip"],
     srcs: ["?33-*/**/*", "??33-*/**/*"],
@@ -2617,7 +2617,7 @@
     filename: "art-run-test-target-data-shard33.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard34-tmp",
     out: ["art-run-test-target-data-shard34.zip"],
     srcs: ["?34-*/**/*", "??34-*/**/*"],
@@ -2633,7 +2633,7 @@
     filename: "art-run-test-target-data-shard34.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard35-tmp",
     out: ["art-run-test-target-data-shard35.zip"],
     srcs: ["?35-*/**/*", "??35-*/**/*"],
@@ -2649,7 +2649,7 @@
     filename: "art-run-test-target-data-shard35.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard36-tmp",
     out: ["art-run-test-target-data-shard36.zip"],
     srcs: ["?36-*/**/*", "??36-*/**/*"],
@@ -2665,7 +2665,7 @@
     filename: "art-run-test-target-data-shard36.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard37-tmp",
     out: ["art-run-test-target-data-shard37.zip"],
     srcs: ["?37-*/**/*", "??37-*/**/*"],
@@ -2681,7 +2681,7 @@
     filename: "art-run-test-target-data-shard37.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard38-tmp",
     out: ["art-run-test-target-data-shard38.zip"],
     srcs: ["?38-*/**/*", "??38-*/**/*"],
@@ -2697,7 +2697,7 @@
     filename: "art-run-test-target-data-shard38.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard39-tmp",
     out: ["art-run-test-target-data-shard39.zip"],
     srcs: ["?39-*/**/*", "??39-*/**/*"],
@@ -2713,7 +2713,7 @@
     filename: "art-run-test-target-data-shard39.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard40-tmp",
     out: ["art-run-test-target-data-shard40.zip"],
     srcs: ["?40-*/**/*", "??40-*/**/*"],
@@ -2729,7 +2729,7 @@
     filename: "art-run-test-target-data-shard40.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard41-tmp",
     out: ["art-run-test-target-data-shard41.zip"],
     srcs: ["?41-*/**/*", "??41-*/**/*"],
@@ -2745,7 +2745,7 @@
     filename: "art-run-test-target-data-shard41.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard42-tmp",
     out: ["art-run-test-target-data-shard42.zip"],
     srcs: ["?42-*/**/*", "??42-*/**/*"],
@@ -2761,7 +2761,7 @@
     filename: "art-run-test-target-data-shard42.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard43-tmp",
     out: ["art-run-test-target-data-shard43.zip"],
     srcs: ["?43-*/**/*", "??43-*/**/*"],
@@ -2777,7 +2777,7 @@
     filename: "art-run-test-target-data-shard43.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard44-tmp",
     out: ["art-run-test-target-data-shard44.zip"],
     srcs: ["?44-*/**/*", "??44-*/**/*"],
@@ -2793,7 +2793,7 @@
     filename: "art-run-test-target-data-shard44.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard45-tmp",
     out: ["art-run-test-target-data-shard45.zip"],
     srcs: ["?45-*/**/*", "??45-*/**/*"],
@@ -2809,7 +2809,7 @@
     filename: "art-run-test-target-data-shard45.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard46-tmp",
     out: ["art-run-test-target-data-shard46.zip"],
     srcs: ["?46-*/**/*", "??46-*/**/*"],
@@ -2825,7 +2825,7 @@
     filename: "art-run-test-target-data-shard46.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard47-tmp",
     out: ["art-run-test-target-data-shard47.zip"],
     srcs: ["?47-*/**/*", "??47-*/**/*"],
@@ -2841,7 +2841,7 @@
     filename: "art-run-test-target-data-shard47.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard48-tmp",
     out: ["art-run-test-target-data-shard48.zip"],
     srcs: ["?48-*/**/*", "??48-*/**/*"],
@@ -2857,7 +2857,7 @@
     filename: "art-run-test-target-data-shard48.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard49-tmp",
     out: ["art-run-test-target-data-shard49.zip"],
     srcs: ["?49-*/**/*", "??49-*/**/*"],
@@ -2873,7 +2873,7 @@
     filename: "art-run-test-target-data-shard49.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard50-tmp",
     out: ["art-run-test-target-data-shard50.zip"],
     srcs: ["?50-*/**/*", "??50-*/**/*"],
@@ -2889,7 +2889,7 @@
     filename: "art-run-test-target-data-shard50.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard51-tmp",
     out: ["art-run-test-target-data-shard51.zip"],
     srcs: ["?51-*/**/*", "??51-*/**/*"],
@@ -2905,7 +2905,7 @@
     filename: "art-run-test-target-data-shard51.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard52-tmp",
     out: ["art-run-test-target-data-shard52.zip"],
     srcs: ["?52-*/**/*", "??52-*/**/*"],
@@ -2921,7 +2921,7 @@
     filename: "art-run-test-target-data-shard52.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard53-tmp",
     out: ["art-run-test-target-data-shard53.zip"],
     srcs: ["?53-*/**/*", "??53-*/**/*"],
@@ -2937,7 +2937,7 @@
     filename: "art-run-test-target-data-shard53.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard54-tmp",
     out: ["art-run-test-target-data-shard54.zip"],
     srcs: ["?54-*/**/*", "??54-*/**/*"],
@@ -2953,7 +2953,7 @@
     filename: "art-run-test-target-data-shard54.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard55-tmp",
     out: ["art-run-test-target-data-shard55.zip"],
     srcs: ["?55-*/**/*", "??55-*/**/*"],
@@ -2969,7 +2969,7 @@
     filename: "art-run-test-target-data-shard55.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard56-tmp",
     out: ["art-run-test-target-data-shard56.zip"],
     srcs: ["?56-*/**/*", "??56-*/**/*"],
@@ -2985,7 +2985,7 @@
     filename: "art-run-test-target-data-shard56.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard57-tmp",
     out: ["art-run-test-target-data-shard57.zip"],
     srcs: ["?57-*/**/*", "??57-*/**/*"],
@@ -3001,7 +3001,7 @@
     filename: "art-run-test-target-data-shard57.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard58-tmp",
     out: ["art-run-test-target-data-shard58.zip"],
     srcs: ["?58-*/**/*", "??58-*/**/*"],
@@ -3017,7 +3017,7 @@
     filename: "art-run-test-target-data-shard58.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard59-tmp",
     out: ["art-run-test-target-data-shard59.zip"],
     srcs: ["?59-*/**/*", "??59-*/**/*"],
@@ -3033,7 +3033,7 @@
     filename: "art-run-test-target-data-shard59.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard60-tmp",
     out: ["art-run-test-target-data-shard60.zip"],
     srcs: ["?60-*/**/*", "??60-*/**/*"],
@@ -3049,7 +3049,7 @@
     filename: "art-run-test-target-data-shard60.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard61-tmp",
     out: ["art-run-test-target-data-shard61.zip"],
     srcs: ["?61-*/**/*", "??61-*/**/*"],
@@ -3065,7 +3065,7 @@
     filename: "art-run-test-target-data-shard61.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard62-tmp",
     out: ["art-run-test-target-data-shard62.zip"],
     srcs: ["?62-*/**/*", "??62-*/**/*"],
@@ -3081,7 +3081,7 @@
     filename: "art-run-test-target-data-shard62.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard63-tmp",
     out: ["art-run-test-target-data-shard63.zip"],
     srcs: ["?63-*/**/*", "??63-*/**/*"],
@@ -3097,7 +3097,7 @@
     filename: "art-run-test-target-data-shard63.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard64-tmp",
     out: ["art-run-test-target-data-shard64.zip"],
     srcs: ["?64-*/**/*", "??64-*/**/*"],
@@ -3113,7 +3113,7 @@
     filename: "art-run-test-target-data-shard64.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard65-tmp",
     out: ["art-run-test-target-data-shard65.zip"],
     srcs: ["?65-*/**/*", "??65-*/**/*"],
@@ -3129,7 +3129,7 @@
     filename: "art-run-test-target-data-shard65.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard66-tmp",
     out: ["art-run-test-target-data-shard66.zip"],
     srcs: ["?66-*/**/*", "??66-*/**/*"],
@@ -3145,7 +3145,7 @@
     filename: "art-run-test-target-data-shard66.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard67-tmp",
     out: ["art-run-test-target-data-shard67.zip"],
     srcs: ["?67-*/**/*", "??67-*/**/*"],
@@ -3161,7 +3161,7 @@
     filename: "art-run-test-target-data-shard67.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard68-tmp",
     out: ["art-run-test-target-data-shard68.zip"],
     srcs: ["?68-*/**/*", "??68-*/**/*"],
@@ -3177,7 +3177,7 @@
     filename: "art-run-test-target-data-shard68.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard69-tmp",
     out: ["art-run-test-target-data-shard69.zip"],
     srcs: ["?69-*/**/*", "??69-*/**/*"],
@@ -3193,7 +3193,7 @@
     filename: "art-run-test-target-data-shard69.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard70-tmp",
     out: ["art-run-test-target-data-shard70.zip"],
     srcs: ["?70-*/**/*", "??70-*/**/*"],
@@ -3209,7 +3209,7 @@
     filename: "art-run-test-target-data-shard70.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard71-tmp",
     out: ["art-run-test-target-data-shard71.zip"],
     srcs: ["?71-*/**/*", "??71-*/**/*"],
@@ -3225,7 +3225,7 @@
     filename: "art-run-test-target-data-shard71.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard72-tmp",
     out: ["art-run-test-target-data-shard72.zip"],
     srcs: ["?72-*/**/*", "??72-*/**/*"],
@@ -3241,7 +3241,7 @@
     filename: "art-run-test-target-data-shard72.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard73-tmp",
     out: ["art-run-test-target-data-shard73.zip"],
     srcs: ["?73-*/**/*", "??73-*/**/*"],
@@ -3257,7 +3257,7 @@
     filename: "art-run-test-target-data-shard73.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard74-tmp",
     out: ["art-run-test-target-data-shard74.zip"],
     srcs: ["?74-*/**/*", "??74-*/**/*"],
@@ -3273,7 +3273,7 @@
     filename: "art-run-test-target-data-shard74.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard75-tmp",
     out: ["art-run-test-target-data-shard75.zip"],
     srcs: ["?75-*/**/*", "??75-*/**/*"],
@@ -3289,7 +3289,7 @@
     filename: "art-run-test-target-data-shard75.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard76-tmp",
     out: ["art-run-test-target-data-shard76.zip"],
     srcs: ["?76-*/**/*", "??76-*/**/*"],
@@ -3305,7 +3305,7 @@
     filename: "art-run-test-target-data-shard76.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard77-tmp",
     out: ["art-run-test-target-data-shard77.zip"],
     srcs: ["?77-*/**/*", "??77-*/**/*"],
@@ -3321,7 +3321,7 @@
     filename: "art-run-test-target-data-shard77.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard78-tmp",
     out: ["art-run-test-target-data-shard78.zip"],
     srcs: ["?78-*/**/*", "??78-*/**/*"],
@@ -3337,7 +3337,7 @@
     filename: "art-run-test-target-data-shard78.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard79-tmp",
     out: ["art-run-test-target-data-shard79.zip"],
     srcs: ["?79-*/**/*", "??79-*/**/*"],
@@ -3353,7 +3353,7 @@
     filename: "art-run-test-target-data-shard79.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard80-tmp",
     out: ["art-run-test-target-data-shard80.zip"],
     srcs: ["?80-*/**/*", "??80-*/**/*"],
@@ -3369,7 +3369,7 @@
     filename: "art-run-test-target-data-shard80.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard81-tmp",
     out: ["art-run-test-target-data-shard81.zip"],
     srcs: ["?81-*/**/*", "??81-*/**/*"],
@@ -3385,7 +3385,7 @@
     filename: "art-run-test-target-data-shard81.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard82-tmp",
     out: ["art-run-test-target-data-shard82.zip"],
     srcs: ["?82-*/**/*", "??82-*/**/*"],
@@ -3401,7 +3401,7 @@
     filename: "art-run-test-target-data-shard82.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard83-tmp",
     out: ["art-run-test-target-data-shard83.zip"],
     srcs: ["?83-*/**/*", "??83-*/**/*"],
@@ -3417,7 +3417,7 @@
     filename: "art-run-test-target-data-shard83.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard84-tmp",
     out: ["art-run-test-target-data-shard84.zip"],
     srcs: ["?84-*/**/*", "??84-*/**/*"],
@@ -3433,7 +3433,7 @@
     filename: "art-run-test-target-data-shard84.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard85-tmp",
     out: ["art-run-test-target-data-shard85.zip"],
     srcs: ["?85-*/**/*", "??85-*/**/*"],
@@ -3449,7 +3449,7 @@
     filename: "art-run-test-target-data-shard85.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard86-tmp",
     out: ["art-run-test-target-data-shard86.zip"],
     srcs: ["?86-*/**/*", "??86-*/**/*"],
@@ -3465,7 +3465,7 @@
     filename: "art-run-test-target-data-shard86.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard87-tmp",
     out: ["art-run-test-target-data-shard87.zip"],
     srcs: ["?87-*/**/*", "??87-*/**/*"],
@@ -3481,7 +3481,7 @@
     filename: "art-run-test-target-data-shard87.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard88-tmp",
     out: ["art-run-test-target-data-shard88.zip"],
     srcs: ["?88-*/**/*", "??88-*/**/*"],
@@ -3497,7 +3497,7 @@
     filename: "art-run-test-target-data-shard88.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard89-tmp",
     out: ["art-run-test-target-data-shard89.zip"],
     srcs: ["?89-*/**/*", "??89-*/**/*"],
@@ -3513,7 +3513,7 @@
     filename: "art-run-test-target-data-shard89.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard90-tmp",
     out: ["art-run-test-target-data-shard90.zip"],
     srcs: ["?90-*/**/*", "??90-*/**/*"],
@@ -3529,7 +3529,7 @@
     filename: "art-run-test-target-data-shard90.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard91-tmp",
     out: ["art-run-test-target-data-shard91.zip"],
     srcs: ["?91-*/**/*", "??91-*/**/*"],
@@ -3545,7 +3545,7 @@
     filename: "art-run-test-target-data-shard91.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard92-tmp",
     out: ["art-run-test-target-data-shard92.zip"],
     srcs: ["?92-*/**/*", "??92-*/**/*"],
@@ -3561,7 +3561,7 @@
     filename: "art-run-test-target-data-shard92.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard93-tmp",
     out: ["art-run-test-target-data-shard93.zip"],
     srcs: ["?93-*/**/*", "??93-*/**/*"],
@@ -3577,7 +3577,7 @@
     filename: "art-run-test-target-data-shard93.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard94-tmp",
     out: ["art-run-test-target-data-shard94.zip"],
     srcs: ["?94-*/**/*", "??94-*/**/*"],
@@ -3593,7 +3593,7 @@
     filename: "art-run-test-target-data-shard94.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard95-tmp",
     out: ["art-run-test-target-data-shard95.zip"],
     srcs: ["?95-*/**/*", "??95-*/**/*"],
@@ -3609,7 +3609,7 @@
     filename: "art-run-test-target-data-shard95.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard96-tmp",
     out: ["art-run-test-target-data-shard96.zip"],
     srcs: ["?96-*/**/*", "??96-*/**/*"],
@@ -3625,7 +3625,7 @@
     filename: "art-run-test-target-data-shard96.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard97-tmp",
     out: ["art-run-test-target-data-shard97.zip"],
     srcs: ["?97-*/**/*", "??97-*/**/*"],
@@ -3641,7 +3641,7 @@
     filename: "art-run-test-target-data-shard97.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard98-tmp",
     out: ["art-run-test-target-data-shard98.zip"],
     srcs: ["?98-*/**/*", "??98-*/**/*"],
@@ -3657,7 +3657,7 @@
     filename: "art-run-test-target-data-shard98.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-shard99-tmp",
     out: ["art-run-test-target-data-shard99.zip"],
     srcs: ["?99-*/**/*", "??99-*/**/*"],
@@ -3703,7 +3703,7 @@
          "$(in)",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-merged-tmp",
     defaults: ["art_module_source_build_genrule_defaults"],
     out: ["art-run-test-target-data-merged.zip"],
@@ -3925,7 +3925,7 @@
 }
 
 // Phony target used to build all shards
-java_genrule_host {
+java_genrule {
     name: "art-run-test-target-data-tmp",
     defaults: ["art-run-test-data-defaults"],
     out: ["art-run-test-target-data.txt"],
@@ -4145,7 +4145,7 @@
     filename: "art-run-test-target-data.txt",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard00-tmp",
     out: ["art-run-test-jvm-data-shard00.zip"],
     srcs: ["?00-*/**/*", "??00-*/**/*"],
@@ -4161,7 +4161,7 @@
     filename: "art-run-test-jvm-data-shard00.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard01-tmp",
     out: ["art-run-test-jvm-data-shard01.zip"],
     srcs: ["?01-*/**/*", "??01-*/**/*"],
@@ -4177,7 +4177,7 @@
     filename: "art-run-test-jvm-data-shard01.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard02-tmp",
     out: ["art-run-test-jvm-data-shard02.zip"],
     srcs: ["?02-*/**/*", "??02-*/**/*"],
@@ -4193,7 +4193,7 @@
     filename: "art-run-test-jvm-data-shard02.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard03-tmp",
     out: ["art-run-test-jvm-data-shard03.zip"],
     srcs: ["?03-*/**/*", "??03-*/**/*"],
@@ -4209,7 +4209,7 @@
     filename: "art-run-test-jvm-data-shard03.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard04-tmp",
     out: ["art-run-test-jvm-data-shard04.zip"],
     srcs: ["?04-*/**/*", "??04-*/**/*"],
@@ -4225,7 +4225,7 @@
     filename: "art-run-test-jvm-data-shard04.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard05-tmp",
     out: ["art-run-test-jvm-data-shard05.zip"],
     srcs: ["?05-*/**/*", "??05-*/**/*"],
@@ -4241,7 +4241,7 @@
     filename: "art-run-test-jvm-data-shard05.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard06-tmp",
     out: ["art-run-test-jvm-data-shard06.zip"],
     srcs: ["?06-*/**/*", "??06-*/**/*"],
@@ -4257,7 +4257,7 @@
     filename: "art-run-test-jvm-data-shard06.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard07-tmp",
     out: ["art-run-test-jvm-data-shard07.zip"],
     srcs: ["?07-*/**/*", "??07-*/**/*"],
@@ -4273,7 +4273,7 @@
     filename: "art-run-test-jvm-data-shard07.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard08-tmp",
     out: ["art-run-test-jvm-data-shard08.zip"],
     srcs: ["?08-*/**/*", "??08-*/**/*"],
@@ -4289,7 +4289,7 @@
     filename: "art-run-test-jvm-data-shard08.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard09-tmp",
     out: ["art-run-test-jvm-data-shard09.zip"],
     srcs: ["?09-*/**/*", "??09-*/**/*"],
@@ -4305,7 +4305,7 @@
     filename: "art-run-test-jvm-data-shard09.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard10-tmp",
     out: ["art-run-test-jvm-data-shard10.zip"],
     srcs: ["?10-*/**/*", "??10-*/**/*"],
@@ -4321,7 +4321,7 @@
     filename: "art-run-test-jvm-data-shard10.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard11-tmp",
     out: ["art-run-test-jvm-data-shard11.zip"],
     srcs: ["?11-*/**/*", "??11-*/**/*"],
@@ -4337,7 +4337,7 @@
     filename: "art-run-test-jvm-data-shard11.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard12-tmp",
     out: ["art-run-test-jvm-data-shard12.zip"],
     srcs: ["?12-*/**/*", "??12-*/**/*"],
@@ -4353,7 +4353,7 @@
     filename: "art-run-test-jvm-data-shard12.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard13-tmp",
     out: ["art-run-test-jvm-data-shard13.zip"],
     srcs: ["?13-*/**/*", "??13-*/**/*"],
@@ -4369,7 +4369,7 @@
     filename: "art-run-test-jvm-data-shard13.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard14-tmp",
     out: ["art-run-test-jvm-data-shard14.zip"],
     srcs: ["?14-*/**/*", "??14-*/**/*"],
@@ -4385,7 +4385,7 @@
     filename: "art-run-test-jvm-data-shard14.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard15-tmp",
     out: ["art-run-test-jvm-data-shard15.zip"],
     srcs: ["?15-*/**/*", "??15-*/**/*"],
@@ -4401,7 +4401,7 @@
     filename: "art-run-test-jvm-data-shard15.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard16-tmp",
     out: ["art-run-test-jvm-data-shard16.zip"],
     srcs: ["?16-*/**/*", "??16-*/**/*"],
@@ -4417,7 +4417,7 @@
     filename: "art-run-test-jvm-data-shard16.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard17-tmp",
     out: ["art-run-test-jvm-data-shard17.zip"],
     srcs: ["?17-*/**/*", "??17-*/**/*"],
@@ -4433,7 +4433,7 @@
     filename: "art-run-test-jvm-data-shard17.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard18-tmp",
     out: ["art-run-test-jvm-data-shard18.zip"],
     srcs: ["?18-*/**/*", "??18-*/**/*"],
@@ -4449,7 +4449,7 @@
     filename: "art-run-test-jvm-data-shard18.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard19-tmp",
     out: ["art-run-test-jvm-data-shard19.zip"],
     srcs: ["?19-*/**/*", "??19-*/**/*"],
@@ -4465,7 +4465,7 @@
     filename: "art-run-test-jvm-data-shard19.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard20-tmp",
     out: ["art-run-test-jvm-data-shard20.zip"],
     srcs: ["?20-*/**/*", "??20-*/**/*"],
@@ -4481,7 +4481,7 @@
     filename: "art-run-test-jvm-data-shard20.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard21-tmp",
     out: ["art-run-test-jvm-data-shard21.zip"],
     srcs: ["?21-*/**/*", "??21-*/**/*"],
@@ -4497,7 +4497,7 @@
     filename: "art-run-test-jvm-data-shard21.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard22-tmp",
     out: ["art-run-test-jvm-data-shard22.zip"],
     srcs: ["?22-*/**/*", "??22-*/**/*"],
@@ -4513,7 +4513,7 @@
     filename: "art-run-test-jvm-data-shard22.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard23-tmp",
     out: ["art-run-test-jvm-data-shard23.zip"],
     srcs: ["?23-*/**/*", "??23-*/**/*"],
@@ -4529,7 +4529,7 @@
     filename: "art-run-test-jvm-data-shard23.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard24-tmp",
     out: ["art-run-test-jvm-data-shard24.zip"],
     srcs: ["?24-*/**/*", "??24-*/**/*"],
@@ -4545,7 +4545,7 @@
     filename: "art-run-test-jvm-data-shard24.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard25-tmp",
     out: ["art-run-test-jvm-data-shard25.zip"],
     srcs: ["?25-*/**/*", "??25-*/**/*"],
@@ -4561,7 +4561,7 @@
     filename: "art-run-test-jvm-data-shard25.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard26-tmp",
     out: ["art-run-test-jvm-data-shard26.zip"],
     srcs: ["?26-*/**/*", "??26-*/**/*"],
@@ -4577,7 +4577,7 @@
     filename: "art-run-test-jvm-data-shard26.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard27-tmp",
     out: ["art-run-test-jvm-data-shard27.zip"],
     srcs: ["?27-*/**/*", "??27-*/**/*"],
@@ -4593,7 +4593,7 @@
     filename: "art-run-test-jvm-data-shard27.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard28-tmp",
     out: ["art-run-test-jvm-data-shard28.zip"],
     srcs: ["?28-*/**/*", "??28-*/**/*"],
@@ -4609,7 +4609,7 @@
     filename: "art-run-test-jvm-data-shard28.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard29-tmp",
     out: ["art-run-test-jvm-data-shard29.zip"],
     srcs: ["?29-*/**/*", "??29-*/**/*"],
@@ -4625,7 +4625,7 @@
     filename: "art-run-test-jvm-data-shard29.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard30-tmp",
     out: ["art-run-test-jvm-data-shard30.zip"],
     srcs: ["?30-*/**/*", "??30-*/**/*"],
@@ -4641,7 +4641,7 @@
     filename: "art-run-test-jvm-data-shard30.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard31-tmp",
     out: ["art-run-test-jvm-data-shard31.zip"],
     srcs: ["?31-*/**/*", "??31-*/**/*"],
@@ -4657,7 +4657,7 @@
     filename: "art-run-test-jvm-data-shard31.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard32-tmp",
     out: ["art-run-test-jvm-data-shard32.zip"],
     srcs: ["?32-*/**/*", "??32-*/**/*"],
@@ -4673,7 +4673,7 @@
     filename: "art-run-test-jvm-data-shard32.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard33-tmp",
     out: ["art-run-test-jvm-data-shard33.zip"],
     srcs: ["?33-*/**/*", "??33-*/**/*"],
@@ -4689,7 +4689,7 @@
     filename: "art-run-test-jvm-data-shard33.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard34-tmp",
     out: ["art-run-test-jvm-data-shard34.zip"],
     srcs: ["?34-*/**/*", "??34-*/**/*"],
@@ -4705,7 +4705,7 @@
     filename: "art-run-test-jvm-data-shard34.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard35-tmp",
     out: ["art-run-test-jvm-data-shard35.zip"],
     srcs: ["?35-*/**/*", "??35-*/**/*"],
@@ -4721,7 +4721,7 @@
     filename: "art-run-test-jvm-data-shard35.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard36-tmp",
     out: ["art-run-test-jvm-data-shard36.zip"],
     srcs: ["?36-*/**/*", "??36-*/**/*"],
@@ -4737,7 +4737,7 @@
     filename: "art-run-test-jvm-data-shard36.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard37-tmp",
     out: ["art-run-test-jvm-data-shard37.zip"],
     srcs: ["?37-*/**/*", "??37-*/**/*"],
@@ -4753,7 +4753,7 @@
     filename: "art-run-test-jvm-data-shard37.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard38-tmp",
     out: ["art-run-test-jvm-data-shard38.zip"],
     srcs: ["?38-*/**/*", "??38-*/**/*"],
@@ -4769,7 +4769,7 @@
     filename: "art-run-test-jvm-data-shard38.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard39-tmp",
     out: ["art-run-test-jvm-data-shard39.zip"],
     srcs: ["?39-*/**/*", "??39-*/**/*"],
@@ -4785,7 +4785,7 @@
     filename: "art-run-test-jvm-data-shard39.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard40-tmp",
     out: ["art-run-test-jvm-data-shard40.zip"],
     srcs: ["?40-*/**/*", "??40-*/**/*"],
@@ -4801,7 +4801,7 @@
     filename: "art-run-test-jvm-data-shard40.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard41-tmp",
     out: ["art-run-test-jvm-data-shard41.zip"],
     srcs: ["?41-*/**/*", "??41-*/**/*"],
@@ -4817,7 +4817,7 @@
     filename: "art-run-test-jvm-data-shard41.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard42-tmp",
     out: ["art-run-test-jvm-data-shard42.zip"],
     srcs: ["?42-*/**/*", "??42-*/**/*"],
@@ -4833,7 +4833,7 @@
     filename: "art-run-test-jvm-data-shard42.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard43-tmp",
     out: ["art-run-test-jvm-data-shard43.zip"],
     srcs: ["?43-*/**/*", "??43-*/**/*"],
@@ -4849,7 +4849,7 @@
     filename: "art-run-test-jvm-data-shard43.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard44-tmp",
     out: ["art-run-test-jvm-data-shard44.zip"],
     srcs: ["?44-*/**/*", "??44-*/**/*"],
@@ -4865,7 +4865,7 @@
     filename: "art-run-test-jvm-data-shard44.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard45-tmp",
     out: ["art-run-test-jvm-data-shard45.zip"],
     srcs: ["?45-*/**/*", "??45-*/**/*"],
@@ -4881,7 +4881,7 @@
     filename: "art-run-test-jvm-data-shard45.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard46-tmp",
     out: ["art-run-test-jvm-data-shard46.zip"],
     srcs: ["?46-*/**/*", "??46-*/**/*"],
@@ -4897,7 +4897,7 @@
     filename: "art-run-test-jvm-data-shard46.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard47-tmp",
     out: ["art-run-test-jvm-data-shard47.zip"],
     srcs: ["?47-*/**/*", "??47-*/**/*"],
@@ -4913,7 +4913,7 @@
     filename: "art-run-test-jvm-data-shard47.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard48-tmp",
     out: ["art-run-test-jvm-data-shard48.zip"],
     srcs: ["?48-*/**/*", "??48-*/**/*"],
@@ -4929,7 +4929,7 @@
     filename: "art-run-test-jvm-data-shard48.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard49-tmp",
     out: ["art-run-test-jvm-data-shard49.zip"],
     srcs: ["?49-*/**/*", "??49-*/**/*"],
@@ -4945,7 +4945,7 @@
     filename: "art-run-test-jvm-data-shard49.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard50-tmp",
     out: ["art-run-test-jvm-data-shard50.zip"],
     srcs: ["?50-*/**/*", "??50-*/**/*"],
@@ -4961,7 +4961,7 @@
     filename: "art-run-test-jvm-data-shard50.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard51-tmp",
     out: ["art-run-test-jvm-data-shard51.zip"],
     srcs: ["?51-*/**/*", "??51-*/**/*"],
@@ -4977,7 +4977,7 @@
     filename: "art-run-test-jvm-data-shard51.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard52-tmp",
     out: ["art-run-test-jvm-data-shard52.zip"],
     srcs: ["?52-*/**/*", "??52-*/**/*"],
@@ -4993,7 +4993,7 @@
     filename: "art-run-test-jvm-data-shard52.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard53-tmp",
     out: ["art-run-test-jvm-data-shard53.zip"],
     srcs: ["?53-*/**/*", "??53-*/**/*"],
@@ -5009,7 +5009,7 @@
     filename: "art-run-test-jvm-data-shard53.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard54-tmp",
     out: ["art-run-test-jvm-data-shard54.zip"],
     srcs: ["?54-*/**/*", "??54-*/**/*"],
@@ -5025,7 +5025,7 @@
     filename: "art-run-test-jvm-data-shard54.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard55-tmp",
     out: ["art-run-test-jvm-data-shard55.zip"],
     srcs: ["?55-*/**/*", "??55-*/**/*"],
@@ -5041,7 +5041,7 @@
     filename: "art-run-test-jvm-data-shard55.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard56-tmp",
     out: ["art-run-test-jvm-data-shard56.zip"],
     srcs: ["?56-*/**/*", "??56-*/**/*"],
@@ -5057,7 +5057,7 @@
     filename: "art-run-test-jvm-data-shard56.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard57-tmp",
     out: ["art-run-test-jvm-data-shard57.zip"],
     srcs: ["?57-*/**/*", "??57-*/**/*"],
@@ -5073,7 +5073,7 @@
     filename: "art-run-test-jvm-data-shard57.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard58-tmp",
     out: ["art-run-test-jvm-data-shard58.zip"],
     srcs: ["?58-*/**/*", "??58-*/**/*"],
@@ -5089,7 +5089,7 @@
     filename: "art-run-test-jvm-data-shard58.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard59-tmp",
     out: ["art-run-test-jvm-data-shard59.zip"],
     srcs: ["?59-*/**/*", "??59-*/**/*"],
@@ -5105,7 +5105,7 @@
     filename: "art-run-test-jvm-data-shard59.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard60-tmp",
     out: ["art-run-test-jvm-data-shard60.zip"],
     srcs: ["?60-*/**/*", "??60-*/**/*"],
@@ -5121,7 +5121,7 @@
     filename: "art-run-test-jvm-data-shard60.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard61-tmp",
     out: ["art-run-test-jvm-data-shard61.zip"],
     srcs: ["?61-*/**/*", "??61-*/**/*"],
@@ -5137,7 +5137,7 @@
     filename: "art-run-test-jvm-data-shard61.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard62-tmp",
     out: ["art-run-test-jvm-data-shard62.zip"],
     srcs: ["?62-*/**/*", "??62-*/**/*"],
@@ -5153,7 +5153,7 @@
     filename: "art-run-test-jvm-data-shard62.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard63-tmp",
     out: ["art-run-test-jvm-data-shard63.zip"],
     srcs: ["?63-*/**/*", "??63-*/**/*"],
@@ -5169,7 +5169,7 @@
     filename: "art-run-test-jvm-data-shard63.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard64-tmp",
     out: ["art-run-test-jvm-data-shard64.zip"],
     srcs: ["?64-*/**/*", "??64-*/**/*"],
@@ -5185,7 +5185,7 @@
     filename: "art-run-test-jvm-data-shard64.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard65-tmp",
     out: ["art-run-test-jvm-data-shard65.zip"],
     srcs: ["?65-*/**/*", "??65-*/**/*"],
@@ -5201,7 +5201,7 @@
     filename: "art-run-test-jvm-data-shard65.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard66-tmp",
     out: ["art-run-test-jvm-data-shard66.zip"],
     srcs: ["?66-*/**/*", "??66-*/**/*"],
@@ -5217,7 +5217,7 @@
     filename: "art-run-test-jvm-data-shard66.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard67-tmp",
     out: ["art-run-test-jvm-data-shard67.zip"],
     srcs: ["?67-*/**/*", "??67-*/**/*"],
@@ -5233,7 +5233,7 @@
     filename: "art-run-test-jvm-data-shard67.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard68-tmp",
     out: ["art-run-test-jvm-data-shard68.zip"],
     srcs: ["?68-*/**/*", "??68-*/**/*"],
@@ -5249,7 +5249,7 @@
     filename: "art-run-test-jvm-data-shard68.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard69-tmp",
     out: ["art-run-test-jvm-data-shard69.zip"],
     srcs: ["?69-*/**/*", "??69-*/**/*"],
@@ -5265,7 +5265,7 @@
     filename: "art-run-test-jvm-data-shard69.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard70-tmp",
     out: ["art-run-test-jvm-data-shard70.zip"],
     srcs: ["?70-*/**/*", "??70-*/**/*"],
@@ -5281,7 +5281,7 @@
     filename: "art-run-test-jvm-data-shard70.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard71-tmp",
     out: ["art-run-test-jvm-data-shard71.zip"],
     srcs: ["?71-*/**/*", "??71-*/**/*"],
@@ -5297,7 +5297,7 @@
     filename: "art-run-test-jvm-data-shard71.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard72-tmp",
     out: ["art-run-test-jvm-data-shard72.zip"],
     srcs: ["?72-*/**/*", "??72-*/**/*"],
@@ -5313,7 +5313,7 @@
     filename: "art-run-test-jvm-data-shard72.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard73-tmp",
     out: ["art-run-test-jvm-data-shard73.zip"],
     srcs: ["?73-*/**/*", "??73-*/**/*"],
@@ -5329,7 +5329,7 @@
     filename: "art-run-test-jvm-data-shard73.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard74-tmp",
     out: ["art-run-test-jvm-data-shard74.zip"],
     srcs: ["?74-*/**/*", "??74-*/**/*"],
@@ -5345,7 +5345,7 @@
     filename: "art-run-test-jvm-data-shard74.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard75-tmp",
     out: ["art-run-test-jvm-data-shard75.zip"],
     srcs: ["?75-*/**/*", "??75-*/**/*"],
@@ -5361,7 +5361,7 @@
     filename: "art-run-test-jvm-data-shard75.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard76-tmp",
     out: ["art-run-test-jvm-data-shard76.zip"],
     srcs: ["?76-*/**/*", "??76-*/**/*"],
@@ -5377,7 +5377,7 @@
     filename: "art-run-test-jvm-data-shard76.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard77-tmp",
     out: ["art-run-test-jvm-data-shard77.zip"],
     srcs: ["?77-*/**/*", "??77-*/**/*"],
@@ -5393,7 +5393,7 @@
     filename: "art-run-test-jvm-data-shard77.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard78-tmp",
     out: ["art-run-test-jvm-data-shard78.zip"],
     srcs: ["?78-*/**/*", "??78-*/**/*"],
@@ -5409,7 +5409,7 @@
     filename: "art-run-test-jvm-data-shard78.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard79-tmp",
     out: ["art-run-test-jvm-data-shard79.zip"],
     srcs: ["?79-*/**/*", "??79-*/**/*"],
@@ -5425,7 +5425,7 @@
     filename: "art-run-test-jvm-data-shard79.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard80-tmp",
     out: ["art-run-test-jvm-data-shard80.zip"],
     srcs: ["?80-*/**/*", "??80-*/**/*"],
@@ -5441,7 +5441,7 @@
     filename: "art-run-test-jvm-data-shard80.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard81-tmp",
     out: ["art-run-test-jvm-data-shard81.zip"],
     srcs: ["?81-*/**/*", "??81-*/**/*"],
@@ -5457,7 +5457,7 @@
     filename: "art-run-test-jvm-data-shard81.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard82-tmp",
     out: ["art-run-test-jvm-data-shard82.zip"],
     srcs: ["?82-*/**/*", "??82-*/**/*"],
@@ -5473,7 +5473,7 @@
     filename: "art-run-test-jvm-data-shard82.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard83-tmp",
     out: ["art-run-test-jvm-data-shard83.zip"],
     srcs: ["?83-*/**/*", "??83-*/**/*"],
@@ -5489,7 +5489,7 @@
     filename: "art-run-test-jvm-data-shard83.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard84-tmp",
     out: ["art-run-test-jvm-data-shard84.zip"],
     srcs: ["?84-*/**/*", "??84-*/**/*"],
@@ -5505,7 +5505,7 @@
     filename: "art-run-test-jvm-data-shard84.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard85-tmp",
     out: ["art-run-test-jvm-data-shard85.zip"],
     srcs: ["?85-*/**/*", "??85-*/**/*"],
@@ -5521,7 +5521,7 @@
     filename: "art-run-test-jvm-data-shard85.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard86-tmp",
     out: ["art-run-test-jvm-data-shard86.zip"],
     srcs: ["?86-*/**/*", "??86-*/**/*"],
@@ -5537,7 +5537,7 @@
     filename: "art-run-test-jvm-data-shard86.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard87-tmp",
     out: ["art-run-test-jvm-data-shard87.zip"],
     srcs: ["?87-*/**/*", "??87-*/**/*"],
@@ -5553,7 +5553,7 @@
     filename: "art-run-test-jvm-data-shard87.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard88-tmp",
     out: ["art-run-test-jvm-data-shard88.zip"],
     srcs: ["?88-*/**/*", "??88-*/**/*"],
@@ -5569,7 +5569,7 @@
     filename: "art-run-test-jvm-data-shard88.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard89-tmp",
     out: ["art-run-test-jvm-data-shard89.zip"],
     srcs: ["?89-*/**/*", "??89-*/**/*"],
@@ -5585,7 +5585,7 @@
     filename: "art-run-test-jvm-data-shard89.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard90-tmp",
     out: ["art-run-test-jvm-data-shard90.zip"],
     srcs: ["?90-*/**/*", "??90-*/**/*"],
@@ -5601,7 +5601,7 @@
     filename: "art-run-test-jvm-data-shard90.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard91-tmp",
     out: ["art-run-test-jvm-data-shard91.zip"],
     srcs: ["?91-*/**/*", "??91-*/**/*"],
@@ -5617,7 +5617,7 @@
     filename: "art-run-test-jvm-data-shard91.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard92-tmp",
     out: ["art-run-test-jvm-data-shard92.zip"],
     srcs: ["?92-*/**/*", "??92-*/**/*"],
@@ -5633,7 +5633,7 @@
     filename: "art-run-test-jvm-data-shard92.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard93-tmp",
     out: ["art-run-test-jvm-data-shard93.zip"],
     srcs: ["?93-*/**/*", "??93-*/**/*"],
@@ -5649,7 +5649,7 @@
     filename: "art-run-test-jvm-data-shard93.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard94-tmp",
     out: ["art-run-test-jvm-data-shard94.zip"],
     srcs: ["?94-*/**/*", "??94-*/**/*"],
@@ -5665,7 +5665,7 @@
     filename: "art-run-test-jvm-data-shard94.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard95-tmp",
     out: ["art-run-test-jvm-data-shard95.zip"],
     srcs: ["?95-*/**/*", "??95-*/**/*"],
@@ -5681,7 +5681,7 @@
     filename: "art-run-test-jvm-data-shard95.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard96-tmp",
     out: ["art-run-test-jvm-data-shard96.zip"],
     srcs: ["?96-*/**/*", "??96-*/**/*"],
@@ -5697,7 +5697,7 @@
     filename: "art-run-test-jvm-data-shard96.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard97-tmp",
     out: ["art-run-test-jvm-data-shard97.zip"],
     srcs: ["?97-*/**/*", "??97-*/**/*"],
@@ -5713,7 +5713,7 @@
     filename: "art-run-test-jvm-data-shard97.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard98-tmp",
     out: ["art-run-test-jvm-data-shard98.zip"],
     srcs: ["?98-*/**/*", "??98-*/**/*"],
@@ -5729,7 +5729,7 @@
     filename: "art-run-test-jvm-data-shard98.zip",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-shard99-tmp",
     out: ["art-run-test-jvm-data-shard99.zip"],
     srcs: ["?99-*/**/*", "??99-*/**/*"],
@@ -5775,7 +5775,7 @@
          "$(in)",
 }
 
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-merged-tmp",
     defaults: ["art_module_source_build_genrule_defaults"],
     out: ["art-run-test-jvm-data-merged.zip"],
@@ -5997,7 +5997,7 @@
 }
 
 // Phony target used to build all shards
-java_genrule_host {
+java_genrule {
     name: "art-run-test-jvm-data-tmp",
     defaults: ["art-run-test-data-defaults"],
     out: ["art-run-test-jvm-data.txt"],
diff --git a/test/Android.run-test.bp.py b/test/Android.run-test.bp.py
index b483f6c..10714a6 100755
--- a/test/Android.run-test.bp.py
+++ b/test/Android.run-test.bp.py
@@ -34,7 +34,7 @@
         name = "art-run-test-{mode}-data-shard{shard}".format(mode=mode, shard=shard)
         names.append(name)
         f.write(textwrap.dedent("""
-          java_genrule_host {{
+          java_genrule {{
               name: "{name}-tmp",
               out: ["{name}.zip"],
               srcs: ["?{shard}-*/**/*", "??{shard}-*/**/*"],
@@ -87,7 +87,7 @@
       srcs = ("\n"+" "*8).join('":{}-tmp",'.format(n) for n in names)
       deps = ("\n"+" "*8).join('"{}",'.format(n) for n in names)
       f.write(textwrap.dedent("""
-        java_genrule_host {{
+        java_genrule {{
             name: "{name}-tmp",
             defaults: ["art_module_source_build_genrule_defaults"],
             out: ["{name}.zip"],
@@ -116,7 +116,7 @@
       deps = ("\n"+" "*8).join('"{}",'.format(n) for n in names)
       f.write(textwrap.dedent("""
         // Phony target used to build all shards
-        java_genrule_host {{
+        java_genrule {{
             name: "{name}-tmp",
             defaults: ["art-run-test-data-defaults"],
             out: ["{name}.txt"],