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

Merge "Rename ART dump-oat rules." am: fde5912660

Browse Source 
Change-Id: I1fde0ecf46c0d38f9b1c45f5be7c03da00b7270a
This commit is contained in:
Automerger Merge Worker
2020-03-17 14:46:35 +00:00
parent e2d6b4586b fde5912660
commit 00903a8d66
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/dexpreopt_bootjars.go
View File

@@ -546,7 +546,11 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) {
var allPhonies android.Paths
for _, image := range image.variants {
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.
output := android.PathForOutput(ctx, "boot."+suffix+".oatdump.txt")
rule := android.NewRuleBuilder()
@@ -569,7 +573,10 @@ func dumpOatRules(ctx android.SingletonContext, image *bootImageConfig) {
Text("echo").FlagWithArg("Output in ", output.String())
rule.Build(pctx, ctx, "phony-dump-oat-boot-"+suffix, "dump oat boot "+arch.String())
allPhonies = append(allPhonies, phony)
// TODO: We need to make imageLocations per-variant to make oatdump work on host.
if image.target.Os == android.Android {
allPhonies = append(allPhonies, phony)
}
}
phony := android.PathForPhony(ctx, "dump-oat-boot")