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

Commit 0780372a authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Use oatdump rather than oatdumpd for boot jar boot.*.oatdump.txt files. 

oatdumpd isn't available as a prebuilt.

Test: m SOONG_CONFIG_art_module_source_build=false droid
Bug: 172480615
Change-Id: I70317eb8f253272d629f23063cbe265d556caad3
parent f1d8819d

java/dexpreopt_bootjars.go

+1 −2
Original line number Diff line number Diff line
@@ -803,8 +803,7 @@ func dumpOatRules(ctx android.ModuleContext, image *bootImageConfig) { 
		rule := android.NewRuleBuilder(pctx, ctx)

		imageLocationsOnHost, _ := image.imageLocations()

		rule.Command().

			// TODO: for now, use the debug version for better error reporting

			BuiltTool("oatdumpd").

			BuiltTool("oatdump").

			FlagWithInputList("--runtime-arg -Xbootclasspath:", image.dexPathsDeps.Paths(), ":").

			FlagWithList("--runtime-arg -Xbootclasspath-locations:", image.dexLocationsDeps, ":").

			FlagWithArg("--image=", strings.Join(imageLocationsOnHost, ":")).Implicits(image.imagesDeps.Paths()).