StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename ART dump-oat rules."

Browse Source
This commit is contained in:
David Srbecky
2020-03-17 14:34:45 +00:00
committed by Gerrit Code Review
parent 28e28ed2f6 46672321e4
commit fde5912660
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/dexpreopt_bootjars.go
View File

@@ -546,7 +546,11 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) {
var allPhonies android.Paths var allPhonies android.Paths
for _, image := range image.variants { for _, image := range image.variants {
arch := image.target.Arch.ArchType arch := image.target.Arch.ArchType
suffix := image.target.String() suffix := arch.String()
// Host and target might both use x86 arch. We need to ensure the names are unique.
if image.target.Os.Class == android.Host {
suffix = "host-" + suffix
}
// Create a rule to call oatdump. // Create a rule to call oatdump.
output := android.PathForOutput(ctx, "boot."+suffix+".oatdump.txt") output := android.PathForOutput(ctx, "boot."+suffix+".oatdump.txt")
rule := android.NewRuleBuilder() rule := android.NewRuleBuilder()
@@ -569,8 +573,11 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) {
Text("echo").FlagWithArg("Output in ", output.String()) Text("echo").FlagWithArg("Output in ", output.String())
rule.Build(pctx, ctx, "phony-dump-oat-boot-"+suffix, "dump oat boot "+arch.String()) rule.Build(pctx, ctx, "phony-dump-oat-boot-"+suffix, "dump oat boot "+arch.String())
// TODO: We need to make imageLocations per-variant to make oatdump work on host.
if image.target.Os == android.Android {
allPhonies = append(allPhonies, phony) allPhonies = append(allPhonies, phony)
} }
}
phony := android.PathForPhony(ctx, "dump-oat-boot") phony := android.PathForPhony(ctx, "dump-oat-boot")
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{