run-test build: Don't merge the shards by default.
The rules create one big zip at the end of the build.
However, the runner has logic to access the correct
shard directly now. So the big zip isn't needed.
Avoid creating the zip to slightly speed up the build.
Test: m art-run-test-{jvm,host,target}-data
Change-Id: I8249ae96c75902f4f1fb056ae2b1001db0ba8d9c
diff --git a/test/Android.run-test.bp b/test/Android.run-test.bp
index 9bc4cd3..e71fe44 100644
--- a/test/Android.run-test.bp
+++ b/test/Android.run-test.bp
@@ -1802,9 +1802,9 @@
}
java_genrule {
- name: "art-run-test-host-data-tmp",
+ name: "art-run-test-host-data-merged-tmp",
defaults: ["art-run-test-data-defaults"],
- out: ["art-run-test-host-data.zip"],
+ out: ["art-run-test-host-data-merged.zip"],
srcs: [
":art-run-test-host-data-shard00-tmp",
":art-run-test-host-data-shard01-tmp",
@@ -1913,6 +1913,227 @@
// Install in the output directory to make it accessible for tests.
prebuilt_etc_host {
+ name: "art-run-test-host-data-merged",
+ defaults: ["art_module_source_build_prebuilt_defaults"],
+ src: ":art-run-test-host-data-merged-tmp",
+ required: [
+ "art-run-test-host-data-shard00",
+ "art-run-test-host-data-shard01",
+ "art-run-test-host-data-shard02",
+ "art-run-test-host-data-shard03",
+ "art-run-test-host-data-shard04",
+ "art-run-test-host-data-shard05",
+ "art-run-test-host-data-shard06",
+ "art-run-test-host-data-shard07",
+ "art-run-test-host-data-shard08",
+ "art-run-test-host-data-shard09",
+ "art-run-test-host-data-shard10",
+ "art-run-test-host-data-shard11",
+ "art-run-test-host-data-shard12",
+ "art-run-test-host-data-shard13",
+ "art-run-test-host-data-shard14",
+ "art-run-test-host-data-shard15",
+ "art-run-test-host-data-shard16",
+ "art-run-test-host-data-shard17",
+ "art-run-test-host-data-shard18",
+ "art-run-test-host-data-shard19",
+ "art-run-test-host-data-shard20",
+ "art-run-test-host-data-shard21",
+ "art-run-test-host-data-shard22",
+ "art-run-test-host-data-shard23",
+ "art-run-test-host-data-shard24",
+ "art-run-test-host-data-shard25",
+ "art-run-test-host-data-shard26",
+ "art-run-test-host-data-shard27",
+ "art-run-test-host-data-shard28",
+ "art-run-test-host-data-shard29",
+ "art-run-test-host-data-shard30",
+ "art-run-test-host-data-shard31",
+ "art-run-test-host-data-shard32",
+ "art-run-test-host-data-shard33",
+ "art-run-test-host-data-shard34",
+ "art-run-test-host-data-shard35",
+ "art-run-test-host-data-shard36",
+ "art-run-test-host-data-shard37",
+ "art-run-test-host-data-shard38",
+ "art-run-test-host-data-shard39",
+ "art-run-test-host-data-shard40",
+ "art-run-test-host-data-shard41",
+ "art-run-test-host-data-shard42",
+ "art-run-test-host-data-shard43",
+ "art-run-test-host-data-shard44",
+ "art-run-test-host-data-shard45",
+ "art-run-test-host-data-shard46",
+ "art-run-test-host-data-shard47",
+ "art-run-test-host-data-shard48",
+ "art-run-test-host-data-shard49",
+ "art-run-test-host-data-shard50",
+ "art-run-test-host-data-shard51",
+ "art-run-test-host-data-shard52",
+ "art-run-test-host-data-shard53",
+ "art-run-test-host-data-shard54",
+ "art-run-test-host-data-shard55",
+ "art-run-test-host-data-shard56",
+ "art-run-test-host-data-shard57",
+ "art-run-test-host-data-shard58",
+ "art-run-test-host-data-shard59",
+ "art-run-test-host-data-shard60",
+ "art-run-test-host-data-shard61",
+ "art-run-test-host-data-shard62",
+ "art-run-test-host-data-shard63",
+ "art-run-test-host-data-shard64",
+ "art-run-test-host-data-shard65",
+ "art-run-test-host-data-shard66",
+ "art-run-test-host-data-shard67",
+ "art-run-test-host-data-shard68",
+ "art-run-test-host-data-shard69",
+ "art-run-test-host-data-shard70",
+ "art-run-test-host-data-shard71",
+ "art-run-test-host-data-shard72",
+ "art-run-test-host-data-shard73",
+ "art-run-test-host-data-shard74",
+ "art-run-test-host-data-shard75",
+ "art-run-test-host-data-shard76",
+ "art-run-test-host-data-shard77",
+ "art-run-test-host-data-shard78",
+ "art-run-test-host-data-shard79",
+ "art-run-test-host-data-shard80",
+ "art-run-test-host-data-shard81",
+ "art-run-test-host-data-shard82",
+ "art-run-test-host-data-shard83",
+ "art-run-test-host-data-shard84",
+ "art-run-test-host-data-shard85",
+ "art-run-test-host-data-shard86",
+ "art-run-test-host-data-shard87",
+ "art-run-test-host-data-shard88",
+ "art-run-test-host-data-shard89",
+ "art-run-test-host-data-shard90",
+ "art-run-test-host-data-shard91",
+ "art-run-test-host-data-shard92",
+ "art-run-test-host-data-shard93",
+ "art-run-test-host-data-shard94",
+ "art-run-test-host-data-shard95",
+ "art-run-test-host-data-shard96",
+ "art-run-test-host-data-shard97",
+ "art-run-test-host-data-shard98",
+ "art-run-test-host-data-shard99",
+ ],
+ sub_dir: "art",
+ filename: "art-run-test-host-data-merged.zip",
+}
+
+// Phony target used to build all shards
+java_genrule {
+ name: "art-run-test-host-data-tmp",
+ defaults: ["art-run-test-data-defaults"],
+ out: ["art-run-test-host-data.txt"],
+ srcs: [
+ ":art-run-test-host-data-shard00-tmp",
+ ":art-run-test-host-data-shard01-tmp",
+ ":art-run-test-host-data-shard02-tmp",
+ ":art-run-test-host-data-shard03-tmp",
+ ":art-run-test-host-data-shard04-tmp",
+ ":art-run-test-host-data-shard05-tmp",
+ ":art-run-test-host-data-shard06-tmp",
+ ":art-run-test-host-data-shard07-tmp",
+ ":art-run-test-host-data-shard08-tmp",
+ ":art-run-test-host-data-shard09-tmp",
+ ":art-run-test-host-data-shard10-tmp",
+ ":art-run-test-host-data-shard11-tmp",
+ ":art-run-test-host-data-shard12-tmp",
+ ":art-run-test-host-data-shard13-tmp",
+ ":art-run-test-host-data-shard14-tmp",
+ ":art-run-test-host-data-shard15-tmp",
+ ":art-run-test-host-data-shard16-tmp",
+ ":art-run-test-host-data-shard17-tmp",
+ ":art-run-test-host-data-shard18-tmp",
+ ":art-run-test-host-data-shard19-tmp",
+ ":art-run-test-host-data-shard20-tmp",
+ ":art-run-test-host-data-shard21-tmp",
+ ":art-run-test-host-data-shard22-tmp",
+ ":art-run-test-host-data-shard23-tmp",
+ ":art-run-test-host-data-shard24-tmp",
+ ":art-run-test-host-data-shard25-tmp",
+ ":art-run-test-host-data-shard26-tmp",
+ ":art-run-test-host-data-shard27-tmp",
+ ":art-run-test-host-data-shard28-tmp",
+ ":art-run-test-host-data-shard29-tmp",
+ ":art-run-test-host-data-shard30-tmp",
+ ":art-run-test-host-data-shard31-tmp",
+ ":art-run-test-host-data-shard32-tmp",
+ ":art-run-test-host-data-shard33-tmp",
+ ":art-run-test-host-data-shard34-tmp",
+ ":art-run-test-host-data-shard35-tmp",
+ ":art-run-test-host-data-shard36-tmp",
+ ":art-run-test-host-data-shard37-tmp",
+ ":art-run-test-host-data-shard38-tmp",
+ ":art-run-test-host-data-shard39-tmp",
+ ":art-run-test-host-data-shard40-tmp",
+ ":art-run-test-host-data-shard41-tmp",
+ ":art-run-test-host-data-shard42-tmp",
+ ":art-run-test-host-data-shard43-tmp",
+ ":art-run-test-host-data-shard44-tmp",
+ ":art-run-test-host-data-shard45-tmp",
+ ":art-run-test-host-data-shard46-tmp",
+ ":art-run-test-host-data-shard47-tmp",
+ ":art-run-test-host-data-shard48-tmp",
+ ":art-run-test-host-data-shard49-tmp",
+ ":art-run-test-host-data-shard50-tmp",
+ ":art-run-test-host-data-shard51-tmp",
+ ":art-run-test-host-data-shard52-tmp",
+ ":art-run-test-host-data-shard53-tmp",
+ ":art-run-test-host-data-shard54-tmp",
+ ":art-run-test-host-data-shard55-tmp",
+ ":art-run-test-host-data-shard56-tmp",
+ ":art-run-test-host-data-shard57-tmp",
+ ":art-run-test-host-data-shard58-tmp",
+ ":art-run-test-host-data-shard59-tmp",
+ ":art-run-test-host-data-shard60-tmp",
+ ":art-run-test-host-data-shard61-tmp",
+ ":art-run-test-host-data-shard62-tmp",
+ ":art-run-test-host-data-shard63-tmp",
+ ":art-run-test-host-data-shard64-tmp",
+ ":art-run-test-host-data-shard65-tmp",
+ ":art-run-test-host-data-shard66-tmp",
+ ":art-run-test-host-data-shard67-tmp",
+ ":art-run-test-host-data-shard68-tmp",
+ ":art-run-test-host-data-shard69-tmp",
+ ":art-run-test-host-data-shard70-tmp",
+ ":art-run-test-host-data-shard71-tmp",
+ ":art-run-test-host-data-shard72-tmp",
+ ":art-run-test-host-data-shard73-tmp",
+ ":art-run-test-host-data-shard74-tmp",
+ ":art-run-test-host-data-shard75-tmp",
+ ":art-run-test-host-data-shard76-tmp",
+ ":art-run-test-host-data-shard77-tmp",
+ ":art-run-test-host-data-shard78-tmp",
+ ":art-run-test-host-data-shard79-tmp",
+ ":art-run-test-host-data-shard80-tmp",
+ ":art-run-test-host-data-shard81-tmp",
+ ":art-run-test-host-data-shard82-tmp",
+ ":art-run-test-host-data-shard83-tmp",
+ ":art-run-test-host-data-shard84-tmp",
+ ":art-run-test-host-data-shard85-tmp",
+ ":art-run-test-host-data-shard86-tmp",
+ ":art-run-test-host-data-shard87-tmp",
+ ":art-run-test-host-data-shard88-tmp",
+ ":art-run-test-host-data-shard89-tmp",
+ ":art-run-test-host-data-shard90-tmp",
+ ":art-run-test-host-data-shard91-tmp",
+ ":art-run-test-host-data-shard92-tmp",
+ ":art-run-test-host-data-shard93-tmp",
+ ":art-run-test-host-data-shard94-tmp",
+ ":art-run-test-host-data-shard95-tmp",
+ ":art-run-test-host-data-shard96-tmp",
+ ":art-run-test-host-data-shard97-tmp",
+ ":art-run-test-host-data-shard98-tmp",
+ ":art-run-test-host-data-shard99-tmp",
+ ],
+ cmd: "echo $(in) > $(out)",
+}
+
+// Phony target used to install all shards
+prebuilt_etc_host {
name: "art-run-test-host-data",
defaults: ["art_module_source_build_prebuilt_defaults"],
src: ":art-run-test-host-data-tmp",
@@ -2019,7 +2240,7 @@
"art-run-test-host-data-shard99",
],
sub_dir: "art",
- filename: "art-run-test-host-data.zip",
+ filename: "art-run-test-host-data.txt",
}
java_genrule {
@@ -3823,9 +4044,9 @@
}
java_genrule {
- name: "art-run-test-target-data-tmp",
+ name: "art-run-test-target-data-merged-tmp",
defaults: ["art-run-test-data-defaults"],
- out: ["art-run-test-target-data.zip"],
+ out: ["art-run-test-target-data-merged.zip"],
srcs: [
":art-run-test-target-data-shard00-tmp",
":art-run-test-target-data-shard01-tmp",
@@ -3934,6 +4155,227 @@
// Install in the output directory to make it accessible for tests.
prebuilt_etc_host {
+ name: "art-run-test-target-data-merged",
+ defaults: ["art_module_source_build_prebuilt_defaults"],
+ src: ":art-run-test-target-data-merged-tmp",
+ required: [
+ "art-run-test-target-data-shard00",
+ "art-run-test-target-data-shard01",
+ "art-run-test-target-data-shard02",
+ "art-run-test-target-data-shard03",
+ "art-run-test-target-data-shard04",
+ "art-run-test-target-data-shard05",
+ "art-run-test-target-data-shard06",
+ "art-run-test-target-data-shard07",
+ "art-run-test-target-data-shard08",
+ "art-run-test-target-data-shard09",
+ "art-run-test-target-data-shard10",
+ "art-run-test-target-data-shard11",
+ "art-run-test-target-data-shard12",
+ "art-run-test-target-data-shard13",
+ "art-run-test-target-data-shard14",
+ "art-run-test-target-data-shard15",
+ "art-run-test-target-data-shard16",
+ "art-run-test-target-data-shard17",
+ "art-run-test-target-data-shard18",
+ "art-run-test-target-data-shard19",
+ "art-run-test-target-data-shard20",
+ "art-run-test-target-data-shard21",
+ "art-run-test-target-data-shard22",
+ "art-run-test-target-data-shard23",
+ "art-run-test-target-data-shard24",
+ "art-run-test-target-data-shard25",
+ "art-run-test-target-data-shard26",
+ "art-run-test-target-data-shard27",
+ "art-run-test-target-data-shard28",
+ "art-run-test-target-data-shard29",
+ "art-run-test-target-data-shard30",
+ "art-run-test-target-data-shard31",
+ "art-run-test-target-data-shard32",
+ "art-run-test-target-data-shard33",
+ "art-run-test-target-data-shard34",
+ "art-run-test-target-data-shard35",
+ "art-run-test-target-data-shard36",
+ "art-run-test-target-data-shard37",
+ "art-run-test-target-data-shard38",
+ "art-run-test-target-data-shard39",
+ "art-run-test-target-data-shard40",
+ "art-run-test-target-data-shard41",
+ "art-run-test-target-data-shard42",
+ "art-run-test-target-data-shard43",
+ "art-run-test-target-data-shard44",
+ "art-run-test-target-data-shard45",
+ "art-run-test-target-data-shard46",
+ "art-run-test-target-data-shard47",
+ "art-run-test-target-data-shard48",
+ "art-run-test-target-data-shard49",
+ "art-run-test-target-data-shard50",
+ "art-run-test-target-data-shard51",
+ "art-run-test-target-data-shard52",
+ "art-run-test-target-data-shard53",
+ "art-run-test-target-data-shard54",
+ "art-run-test-target-data-shard55",
+ "art-run-test-target-data-shard56",
+ "art-run-test-target-data-shard57",
+ "art-run-test-target-data-shard58",
+ "art-run-test-target-data-shard59",
+ "art-run-test-target-data-shard60",
+ "art-run-test-target-data-shard61",
+ "art-run-test-target-data-shard62",
+ "art-run-test-target-data-shard63",
+ "art-run-test-target-data-shard64",
+ "art-run-test-target-data-shard65",
+ "art-run-test-target-data-shard66",
+ "art-run-test-target-data-shard67",
+ "art-run-test-target-data-shard68",
+ "art-run-test-target-data-shard69",
+ "art-run-test-target-data-shard70",
+ "art-run-test-target-data-shard71",
+ "art-run-test-target-data-shard72",
+ "art-run-test-target-data-shard73",
+ "art-run-test-target-data-shard74",
+ "art-run-test-target-data-shard75",
+ "art-run-test-target-data-shard76",
+ "art-run-test-target-data-shard77",
+ "art-run-test-target-data-shard78",
+ "art-run-test-target-data-shard79",
+ "art-run-test-target-data-shard80",
+ "art-run-test-target-data-shard81",
+ "art-run-test-target-data-shard82",
+ "art-run-test-target-data-shard83",
+ "art-run-test-target-data-shard84",
+ "art-run-test-target-data-shard85",
+ "art-run-test-target-data-shard86",
+ "art-run-test-target-data-shard87",
+ "art-run-test-target-data-shard88",
+ "art-run-test-target-data-shard89",
+ "art-run-test-target-data-shard90",
+ "art-run-test-target-data-shard91",
+ "art-run-test-target-data-shard92",
+ "art-run-test-target-data-shard93",
+ "art-run-test-target-data-shard94",
+ "art-run-test-target-data-shard95",
+ "art-run-test-target-data-shard96",
+ "art-run-test-target-data-shard97",
+ "art-run-test-target-data-shard98",
+ "art-run-test-target-data-shard99",
+ ],
+ sub_dir: "art",
+ filename: "art-run-test-target-data-merged.zip",
+}
+
+// Phony target used to build all shards
+java_genrule {
+ name: "art-run-test-target-data-tmp",
+ defaults: ["art-run-test-data-defaults"],
+ out: ["art-run-test-target-data.txt"],
+ srcs: [
+ ":art-run-test-target-data-shard00-tmp",
+ ":art-run-test-target-data-shard01-tmp",
+ ":art-run-test-target-data-shard02-tmp",
+ ":art-run-test-target-data-shard03-tmp",
+ ":art-run-test-target-data-shard04-tmp",
+ ":art-run-test-target-data-shard05-tmp",
+ ":art-run-test-target-data-shard06-tmp",
+ ":art-run-test-target-data-shard07-tmp",
+ ":art-run-test-target-data-shard08-tmp",
+ ":art-run-test-target-data-shard09-tmp",
+ ":art-run-test-target-data-shard10-tmp",
+ ":art-run-test-target-data-shard11-tmp",
+ ":art-run-test-target-data-shard12-tmp",
+ ":art-run-test-target-data-shard13-tmp",
+ ":art-run-test-target-data-shard14-tmp",
+ ":art-run-test-target-data-shard15-tmp",
+ ":art-run-test-target-data-shard16-tmp",
+ ":art-run-test-target-data-shard17-tmp",
+ ":art-run-test-target-data-shard18-tmp",
+ ":art-run-test-target-data-shard19-tmp",
+ ":art-run-test-target-data-shard20-tmp",
+ ":art-run-test-target-data-shard21-tmp",
+ ":art-run-test-target-data-shard22-tmp",
+ ":art-run-test-target-data-shard23-tmp",
+ ":art-run-test-target-data-shard24-tmp",
+ ":art-run-test-target-data-shard25-tmp",
+ ":art-run-test-target-data-shard26-tmp",
+ ":art-run-test-target-data-shard27-tmp",
+ ":art-run-test-target-data-shard28-tmp",
+ ":art-run-test-target-data-shard29-tmp",
+ ":art-run-test-target-data-shard30-tmp",
+ ":art-run-test-target-data-shard31-tmp",
+ ":art-run-test-target-data-shard32-tmp",
+ ":art-run-test-target-data-shard33-tmp",
+ ":art-run-test-target-data-shard34-tmp",
+ ":art-run-test-target-data-shard35-tmp",
+ ":art-run-test-target-data-shard36-tmp",
+ ":art-run-test-target-data-shard37-tmp",
+ ":art-run-test-target-data-shard38-tmp",
+ ":art-run-test-target-data-shard39-tmp",
+ ":art-run-test-target-data-shard40-tmp",
+ ":art-run-test-target-data-shard41-tmp",
+ ":art-run-test-target-data-shard42-tmp",
+ ":art-run-test-target-data-shard43-tmp",
+ ":art-run-test-target-data-shard44-tmp",
+ ":art-run-test-target-data-shard45-tmp",
+ ":art-run-test-target-data-shard46-tmp",
+ ":art-run-test-target-data-shard47-tmp",
+ ":art-run-test-target-data-shard48-tmp",
+ ":art-run-test-target-data-shard49-tmp",
+ ":art-run-test-target-data-shard50-tmp",
+ ":art-run-test-target-data-shard51-tmp",
+ ":art-run-test-target-data-shard52-tmp",
+ ":art-run-test-target-data-shard53-tmp",
+ ":art-run-test-target-data-shard54-tmp",
+ ":art-run-test-target-data-shard55-tmp",
+ ":art-run-test-target-data-shard56-tmp",
+ ":art-run-test-target-data-shard57-tmp",
+ ":art-run-test-target-data-shard58-tmp",
+ ":art-run-test-target-data-shard59-tmp",
+ ":art-run-test-target-data-shard60-tmp",
+ ":art-run-test-target-data-shard61-tmp",
+ ":art-run-test-target-data-shard62-tmp",
+ ":art-run-test-target-data-shard63-tmp",
+ ":art-run-test-target-data-shard64-tmp",
+ ":art-run-test-target-data-shard65-tmp",
+ ":art-run-test-target-data-shard66-tmp",
+ ":art-run-test-target-data-shard67-tmp",
+ ":art-run-test-target-data-shard68-tmp",
+ ":art-run-test-target-data-shard69-tmp",
+ ":art-run-test-target-data-shard70-tmp",
+ ":art-run-test-target-data-shard71-tmp",
+ ":art-run-test-target-data-shard72-tmp",
+ ":art-run-test-target-data-shard73-tmp",
+ ":art-run-test-target-data-shard74-tmp",
+ ":art-run-test-target-data-shard75-tmp",
+ ":art-run-test-target-data-shard76-tmp",
+ ":art-run-test-target-data-shard77-tmp",
+ ":art-run-test-target-data-shard78-tmp",
+ ":art-run-test-target-data-shard79-tmp",
+ ":art-run-test-target-data-shard80-tmp",
+ ":art-run-test-target-data-shard81-tmp",
+ ":art-run-test-target-data-shard82-tmp",
+ ":art-run-test-target-data-shard83-tmp",
+ ":art-run-test-target-data-shard84-tmp",
+ ":art-run-test-target-data-shard85-tmp",
+ ":art-run-test-target-data-shard86-tmp",
+ ":art-run-test-target-data-shard87-tmp",
+ ":art-run-test-target-data-shard88-tmp",
+ ":art-run-test-target-data-shard89-tmp",
+ ":art-run-test-target-data-shard90-tmp",
+ ":art-run-test-target-data-shard91-tmp",
+ ":art-run-test-target-data-shard92-tmp",
+ ":art-run-test-target-data-shard93-tmp",
+ ":art-run-test-target-data-shard94-tmp",
+ ":art-run-test-target-data-shard95-tmp",
+ ":art-run-test-target-data-shard96-tmp",
+ ":art-run-test-target-data-shard97-tmp",
+ ":art-run-test-target-data-shard98-tmp",
+ ":art-run-test-target-data-shard99-tmp",
+ ],
+ cmd: "echo $(in) > $(out)",
+}
+
+// Phony target used to install all shards
+prebuilt_etc_host {
name: "art-run-test-target-data",
defaults: ["art_module_source_build_prebuilt_defaults"],
src: ":art-run-test-target-data-tmp",
@@ -4040,7 +4482,7 @@
"art-run-test-target-data-shard99",
],
sub_dir: "art",
- filename: "art-run-test-target-data.zip",
+ filename: "art-run-test-target-data.txt",
}
java_genrule {
@@ -5844,9 +6286,9 @@
}
java_genrule {
- name: "art-run-test-jvm-data-tmp",
+ name: "art-run-test-jvm-data-merged-tmp",
defaults: ["art-run-test-data-defaults"],
- out: ["art-run-test-jvm-data.zip"],
+ out: ["art-run-test-jvm-data-merged.zip"],
srcs: [
":art-run-test-jvm-data-shard00-tmp",
":art-run-test-jvm-data-shard01-tmp",
@@ -5955,6 +6397,227 @@
// Install in the output directory to make it accessible for tests.
prebuilt_etc_host {
+ name: "art-run-test-jvm-data-merged",
+ defaults: ["art_module_source_build_prebuilt_defaults"],
+ src: ":art-run-test-jvm-data-merged-tmp",
+ required: [
+ "art-run-test-jvm-data-shard00",
+ "art-run-test-jvm-data-shard01",
+ "art-run-test-jvm-data-shard02",
+ "art-run-test-jvm-data-shard03",
+ "art-run-test-jvm-data-shard04",
+ "art-run-test-jvm-data-shard05",
+ "art-run-test-jvm-data-shard06",
+ "art-run-test-jvm-data-shard07",
+ "art-run-test-jvm-data-shard08",
+ "art-run-test-jvm-data-shard09",
+ "art-run-test-jvm-data-shard10",
+ "art-run-test-jvm-data-shard11",
+ "art-run-test-jvm-data-shard12",
+ "art-run-test-jvm-data-shard13",
+ "art-run-test-jvm-data-shard14",
+ "art-run-test-jvm-data-shard15",
+ "art-run-test-jvm-data-shard16",
+ "art-run-test-jvm-data-shard17",
+ "art-run-test-jvm-data-shard18",
+ "art-run-test-jvm-data-shard19",
+ "art-run-test-jvm-data-shard20",
+ "art-run-test-jvm-data-shard21",
+ "art-run-test-jvm-data-shard22",
+ "art-run-test-jvm-data-shard23",
+ "art-run-test-jvm-data-shard24",
+ "art-run-test-jvm-data-shard25",
+ "art-run-test-jvm-data-shard26",
+ "art-run-test-jvm-data-shard27",
+ "art-run-test-jvm-data-shard28",
+ "art-run-test-jvm-data-shard29",
+ "art-run-test-jvm-data-shard30",
+ "art-run-test-jvm-data-shard31",
+ "art-run-test-jvm-data-shard32",
+ "art-run-test-jvm-data-shard33",
+ "art-run-test-jvm-data-shard34",
+ "art-run-test-jvm-data-shard35",
+ "art-run-test-jvm-data-shard36",
+ "art-run-test-jvm-data-shard37",
+ "art-run-test-jvm-data-shard38",
+ "art-run-test-jvm-data-shard39",
+ "art-run-test-jvm-data-shard40",
+ "art-run-test-jvm-data-shard41",
+ "art-run-test-jvm-data-shard42",
+ "art-run-test-jvm-data-shard43",
+ "art-run-test-jvm-data-shard44",
+ "art-run-test-jvm-data-shard45",
+ "art-run-test-jvm-data-shard46",
+ "art-run-test-jvm-data-shard47",
+ "art-run-test-jvm-data-shard48",
+ "art-run-test-jvm-data-shard49",
+ "art-run-test-jvm-data-shard50",
+ "art-run-test-jvm-data-shard51",
+ "art-run-test-jvm-data-shard52",
+ "art-run-test-jvm-data-shard53",
+ "art-run-test-jvm-data-shard54",
+ "art-run-test-jvm-data-shard55",
+ "art-run-test-jvm-data-shard56",
+ "art-run-test-jvm-data-shard57",
+ "art-run-test-jvm-data-shard58",
+ "art-run-test-jvm-data-shard59",
+ "art-run-test-jvm-data-shard60",
+ "art-run-test-jvm-data-shard61",
+ "art-run-test-jvm-data-shard62",
+ "art-run-test-jvm-data-shard63",
+ "art-run-test-jvm-data-shard64",
+ "art-run-test-jvm-data-shard65",
+ "art-run-test-jvm-data-shard66",
+ "art-run-test-jvm-data-shard67",
+ "art-run-test-jvm-data-shard68",
+ "art-run-test-jvm-data-shard69",
+ "art-run-test-jvm-data-shard70",
+ "art-run-test-jvm-data-shard71",
+ "art-run-test-jvm-data-shard72",
+ "art-run-test-jvm-data-shard73",
+ "art-run-test-jvm-data-shard74",
+ "art-run-test-jvm-data-shard75",
+ "art-run-test-jvm-data-shard76",
+ "art-run-test-jvm-data-shard77",
+ "art-run-test-jvm-data-shard78",
+ "art-run-test-jvm-data-shard79",
+ "art-run-test-jvm-data-shard80",
+ "art-run-test-jvm-data-shard81",
+ "art-run-test-jvm-data-shard82",
+ "art-run-test-jvm-data-shard83",
+ "art-run-test-jvm-data-shard84",
+ "art-run-test-jvm-data-shard85",
+ "art-run-test-jvm-data-shard86",
+ "art-run-test-jvm-data-shard87",
+ "art-run-test-jvm-data-shard88",
+ "art-run-test-jvm-data-shard89",
+ "art-run-test-jvm-data-shard90",
+ "art-run-test-jvm-data-shard91",
+ "art-run-test-jvm-data-shard92",
+ "art-run-test-jvm-data-shard93",
+ "art-run-test-jvm-data-shard94",
+ "art-run-test-jvm-data-shard95",
+ "art-run-test-jvm-data-shard96",
+ "art-run-test-jvm-data-shard97",
+ "art-run-test-jvm-data-shard98",
+ "art-run-test-jvm-data-shard99",
+ ],
+ sub_dir: "art",
+ filename: "art-run-test-jvm-data-merged.zip",
+}
+
+// Phony target used to build all shards
+java_genrule {
+ name: "art-run-test-jvm-data-tmp",
+ defaults: ["art-run-test-data-defaults"],
+ out: ["art-run-test-jvm-data.txt"],
+ srcs: [
+ ":art-run-test-jvm-data-shard00-tmp",
+ ":art-run-test-jvm-data-shard01-tmp",
+ ":art-run-test-jvm-data-shard02-tmp",
+ ":art-run-test-jvm-data-shard03-tmp",
+ ":art-run-test-jvm-data-shard04-tmp",
+ ":art-run-test-jvm-data-shard05-tmp",
+ ":art-run-test-jvm-data-shard06-tmp",
+ ":art-run-test-jvm-data-shard07-tmp",
+ ":art-run-test-jvm-data-shard08-tmp",
+ ":art-run-test-jvm-data-shard09-tmp",
+ ":art-run-test-jvm-data-shard10-tmp",
+ ":art-run-test-jvm-data-shard11-tmp",
+ ":art-run-test-jvm-data-shard12-tmp",
+ ":art-run-test-jvm-data-shard13-tmp",
+ ":art-run-test-jvm-data-shard14-tmp",
+ ":art-run-test-jvm-data-shard15-tmp",
+ ":art-run-test-jvm-data-shard16-tmp",
+ ":art-run-test-jvm-data-shard17-tmp",
+ ":art-run-test-jvm-data-shard18-tmp",
+ ":art-run-test-jvm-data-shard19-tmp",
+ ":art-run-test-jvm-data-shard20-tmp",
+ ":art-run-test-jvm-data-shard21-tmp",
+ ":art-run-test-jvm-data-shard22-tmp",
+ ":art-run-test-jvm-data-shard23-tmp",
+ ":art-run-test-jvm-data-shard24-tmp",
+ ":art-run-test-jvm-data-shard25-tmp",
+ ":art-run-test-jvm-data-shard26-tmp",
+ ":art-run-test-jvm-data-shard27-tmp",
+ ":art-run-test-jvm-data-shard28-tmp",
+ ":art-run-test-jvm-data-shard29-tmp",
+ ":art-run-test-jvm-data-shard30-tmp",
+ ":art-run-test-jvm-data-shard31-tmp",
+ ":art-run-test-jvm-data-shard32-tmp",
+ ":art-run-test-jvm-data-shard33-tmp",
+ ":art-run-test-jvm-data-shard34-tmp",
+ ":art-run-test-jvm-data-shard35-tmp",
+ ":art-run-test-jvm-data-shard36-tmp",
+ ":art-run-test-jvm-data-shard37-tmp",
+ ":art-run-test-jvm-data-shard38-tmp",
+ ":art-run-test-jvm-data-shard39-tmp",
+ ":art-run-test-jvm-data-shard40-tmp",
+ ":art-run-test-jvm-data-shard41-tmp",
+ ":art-run-test-jvm-data-shard42-tmp",
+ ":art-run-test-jvm-data-shard43-tmp",
+ ":art-run-test-jvm-data-shard44-tmp",
+ ":art-run-test-jvm-data-shard45-tmp",
+ ":art-run-test-jvm-data-shard46-tmp",
+ ":art-run-test-jvm-data-shard47-tmp",
+ ":art-run-test-jvm-data-shard48-tmp",
+ ":art-run-test-jvm-data-shard49-tmp",
+ ":art-run-test-jvm-data-shard50-tmp",
+ ":art-run-test-jvm-data-shard51-tmp",
+ ":art-run-test-jvm-data-shard52-tmp",
+ ":art-run-test-jvm-data-shard53-tmp",
+ ":art-run-test-jvm-data-shard54-tmp",
+ ":art-run-test-jvm-data-shard55-tmp",
+ ":art-run-test-jvm-data-shard56-tmp",
+ ":art-run-test-jvm-data-shard57-tmp",
+ ":art-run-test-jvm-data-shard58-tmp",
+ ":art-run-test-jvm-data-shard59-tmp",
+ ":art-run-test-jvm-data-shard60-tmp",
+ ":art-run-test-jvm-data-shard61-tmp",
+ ":art-run-test-jvm-data-shard62-tmp",
+ ":art-run-test-jvm-data-shard63-tmp",
+ ":art-run-test-jvm-data-shard64-tmp",
+ ":art-run-test-jvm-data-shard65-tmp",
+ ":art-run-test-jvm-data-shard66-tmp",
+ ":art-run-test-jvm-data-shard67-tmp",
+ ":art-run-test-jvm-data-shard68-tmp",
+ ":art-run-test-jvm-data-shard69-tmp",
+ ":art-run-test-jvm-data-shard70-tmp",
+ ":art-run-test-jvm-data-shard71-tmp",
+ ":art-run-test-jvm-data-shard72-tmp",
+ ":art-run-test-jvm-data-shard73-tmp",
+ ":art-run-test-jvm-data-shard74-tmp",
+ ":art-run-test-jvm-data-shard75-tmp",
+ ":art-run-test-jvm-data-shard76-tmp",
+ ":art-run-test-jvm-data-shard77-tmp",
+ ":art-run-test-jvm-data-shard78-tmp",
+ ":art-run-test-jvm-data-shard79-tmp",
+ ":art-run-test-jvm-data-shard80-tmp",
+ ":art-run-test-jvm-data-shard81-tmp",
+ ":art-run-test-jvm-data-shard82-tmp",
+ ":art-run-test-jvm-data-shard83-tmp",
+ ":art-run-test-jvm-data-shard84-tmp",
+ ":art-run-test-jvm-data-shard85-tmp",
+ ":art-run-test-jvm-data-shard86-tmp",
+ ":art-run-test-jvm-data-shard87-tmp",
+ ":art-run-test-jvm-data-shard88-tmp",
+ ":art-run-test-jvm-data-shard89-tmp",
+ ":art-run-test-jvm-data-shard90-tmp",
+ ":art-run-test-jvm-data-shard91-tmp",
+ ":art-run-test-jvm-data-shard92-tmp",
+ ":art-run-test-jvm-data-shard93-tmp",
+ ":art-run-test-jvm-data-shard94-tmp",
+ ":art-run-test-jvm-data-shard95-tmp",
+ ":art-run-test-jvm-data-shard96-tmp",
+ ":art-run-test-jvm-data-shard97-tmp",
+ ":art-run-test-jvm-data-shard98-tmp",
+ ":art-run-test-jvm-data-shard99-tmp",
+ ],
+ cmd: "echo $(in) > $(out)",
+}
+
+// Phony target used to install all shards
+prebuilt_etc_host {
name: "art-run-test-jvm-data",
defaults: ["art_module_source_build_prebuilt_defaults"],
src: ":art-run-test-jvm-data-tmp",
@@ -6061,5 +6724,5 @@
"art-run-test-jvm-data-shard99",
],
sub_dir: "art",
- filename: "art-run-test-jvm-data.zip",
+ filename: "art-run-test-jvm-data.txt",
}
diff --git a/test/Android.run-test.bp.py b/test/Android.run-test.bp.py
index bca48fe..eaa093a 100755
--- a/test/Android.run-test.bp.py
+++ b/test/Android.run-test.bp.py
@@ -53,7 +53,7 @@
}}
""".format(name=name, mode=mode, shard=shard)))
- name = "art-run-test-{mode}-data".format(mode=mode)
+ name = "art-run-test-{mode}-data-merged".format(mode=mode)
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("""
@@ -81,5 +81,33 @@
}}
""").format(name=name, srcs=srcs, deps=deps))
+ name = "art-run-test-{mode}-data".format(mode=mode)
+ 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("""
+ // Phony target used to build all shards
+ java_genrule {{
+ name: "{name}-tmp",
+ defaults: ["art-run-test-data-defaults"],
+ out: ["{name}.txt"],
+ srcs: [
+ {srcs}
+ ],
+ cmd: "echo $(in) > $(out)",
+ }}
+
+ // Phony target used to install all shards
+ prebuilt_etc_host {{
+ name: "{name}",
+ defaults: ["art_module_source_build_prebuilt_defaults"],
+ src: ":{name}-tmp",
+ required: [
+ {deps}
+ ],
+ sub_dir: "art",
+ filename: "{name}.txt",
+ }}
+ """).format(name=name, srcs=srcs, deps=deps))
+
if __name__ == "__main__":
main()