Merge "Pass correct --image argument to oatdump." am: a4f02412a1

am: 4c1df60960

Change-Id: I764f6e9e9a522b36d6de75c130a653331461efd7
This commit is contained in:
Ulyana Trafimovich
2019-12-06 09:15:02 -08:00
committed by android-build-merger

View File

@@ -547,7 +547,7 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImage) {
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())