Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4f02412 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

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

parents d835daaa 163664a5

java/dexpreopt_bootjars.go

+1 −1
Original line number Diff line number Diff line
@@ -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())