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

profman: Clean up output profile type options.

Browse Source 
Test: m  # Check output boot profiles with hexdump.
Bug: 148067697
Change-Id: Ic20f415ad4eee1fd6396f320b757420884764d2c
This commit is contained in:
Vladimir Marko
2021-04-23 15:18:33 +01:00
parent 4d48aa5255
commit 230bd421a8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dexpreopt/dexpreopt.go
View File

@@ -154,6 +154,7 @@ func profileCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, glo
} }
cmd. cmd.
Flag("--output-profile-type=app").
FlagWithInput("--apk=", module.DexPath). FlagWithInput("--apk=", module.DexPath).
Flag("--dex-location="+module.DexLocation). Flag("--dex-location="+module.DexLocation).
FlagWithOutput("--reference-profile-file=", profilePath) FlagWithOutput("--reference-profile-file=", profilePath)
@@ -185,7 +186,7 @@ func bootProfileCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig,
cmd.FlagWithInput("--create-profile-from=", module.ProfileBootListing.Path()) cmd.FlagWithInput("--create-profile-from=", module.ProfileBootListing.Path())
cmd. cmd.
Flag("--generate-boot-profile"). Flag("--output-profile-type=bprof").
FlagWithInput("--apk=", module.DexPath). FlagWithInput("--apk=", module.DexPath).
Flag("--dex-location="+module.DexLocation). Flag("--dex-location="+module.DexLocation).
FlagWithOutput("--reference-profile-file=", profilePath) FlagWithOutput("--reference-profile-file=", profilePath)

3
java/dexpreopt_bootjars.go
View File

@@ -834,6 +834,7 @@ func bootImageProfileRule(ctx android.SingletonContext, image *bootImageConfig,
rule.Command(). rule.Command().
Text(`ANDROID_LOG_TAGS="*:e"`). Text(`ANDROID_LOG_TAGS="*:e"`).
Tool(globalSoong.Profman). Tool(globalSoong.Profman).
Flag("--output-profile-type=boot").
FlagWithInput("--create-profile-from=", bootImageProfile). FlagWithInput("--create-profile-from=", bootImageProfile).
FlagForEachInput("--apk=", image.dexPathsDeps.Paths()). FlagForEachInput("--apk=", image.dexPathsDeps.Paths()).
FlagForEachArg("--dex-location=", image.getAnyAndroidVariant().dexLocationsDeps). FlagForEachArg("--dex-location=", image.getAnyAndroidVariant().dexLocationsDeps).
@@ -884,7 +885,7 @@ func bootFrameworkProfileRule(ctx android.SingletonContext, image *bootImageConf
rule.Command(). rule.Command().
Text(`ANDROID_LOG_TAGS="*:e"`). Text(`ANDROID_LOG_TAGS="*:e"`).
Tool(globalSoong.Profman). Tool(globalSoong.Profman).
Flag("--generate-boot-profile"). Flag("--output-profile-type=bprof").
FlagWithInput("--create-profile-from=", bootFrameworkProfile). FlagWithInput("--create-profile-from=", bootFrameworkProfile).
FlagForEachInput("--apk=", image.dexPathsDeps.Paths()). FlagForEachInput("--apk=", image.dexPathsDeps.Paths()).
FlagForEachArg("--dex-location=", image.getAnyAndroidVariant().dexLocationsDeps). FlagForEachArg("--dex-location=", image.getAnyAndroidVariant().dexLocationsDeps).