commit a4f02412a193221ed3dc5c515b62885ab5c58544
author Ulyana Trafimovich <skvadrik@google.com> Fri Dec 06 16:55:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 06 16:55:39 2019 +0000
tree 9cb7fcec2a261856b7d09ffd1c281e7d6cd512b4
parent d835daaadeb87761a064fc8bb0fe5ed74ab36da0
parent 163664a5483bcc12db89654ab3650dae00831c5e

Merge "Pass correct --image argument to oatdump."

java/dexpreopt_bootjars.go

diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 280ce8c..88e3bc2 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -547,7 +547,7 @@
 			BuiltTool(ctx, "oatdumpd").
 			FlagWithInputList("--runtime-arg -Xbootclasspath:", image.dexPathsDeps.Paths(), ":").
 			FlagWithList("--runtime-arg -Xbootclasspath-locations:", image.dexLocationsDeps, ":").
-			FlagWithArg("--image=", dexpreopt.PathToLocation(image.images[arch], arch)).Implicit(image.images[arch]).
+			FlagWithArg("--image=", strings.Join(image.imageLocations, ":")).Implicits(image.imagesDeps[arch].Paths()).
 			FlagWithOutput("--output=", output).
 			FlagWithArg("--instruction-set=", arch.String())
 		rule.Build(pctx, ctx, "dump-oat-boot-"+arch.String(), "dump oat boot "+arch.String())