diff options
| author | Vladimir Marko <vmarko@google.com> | 2021-04-23 15:18:33 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2021-04-23 15:19:16 +0100 |
| commit | 230bd421a80ad6e9c50d208e295ea02b4d72d5cc (patch) | |
| tree | 99b98d24ffc903b5e355f24a9fb606976a74bfb8 | |
| parent | 4d48aa52559f99da1a03ef6e055ec95f9953287f (diff) | |
profman: Clean up output profile type options.
Test: m # Check output boot profiles with hexdump.
Bug: 148067697
Change-Id: Ic20f415ad4eee1fd6396f320b757420884764d2c
| -rw-r--r-- | dexpreopt/dexpreopt.go | 3 | ||||
| -rw-r--r-- | java/dexpreopt_bootjars.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index dc17c0a43..3848205d8 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -154,6 +154,7 @@ func profileCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, glo } cmd. + Flag("--output-profile-type=app"). FlagWithInput("--apk=", module.DexPath). Flag("--dex-location="+module.DexLocation). 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. - Flag("--generate-boot-profile"). + Flag("--output-profile-type=bprof"). FlagWithInput("--apk=", module.DexPath). Flag("--dex-location="+module.DexLocation). FlagWithOutput("--reference-profile-file=", profilePath) diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index e57c3e98d..f85e1c97e 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -834,6 +834,7 @@ func bootImageProfileRule(ctx android.SingletonContext, image *bootImageConfig, rule.Command(). Text(`ANDROID_LOG_TAGS="*:e"`). Tool(globalSoong.Profman). + Flag("--output-profile-type=boot"). FlagWithInput("--create-profile-from=", bootImageProfile). FlagForEachInput("--apk=", image.dexPathsDeps.Paths()). FlagForEachArg("--dex-location=", image.getAnyAndroidVariant().dexLocationsDeps). @@ -884,7 +885,7 @@ func bootFrameworkProfileRule(ctx android.SingletonContext, image *bootImageConf rule.Command(). Text(`ANDROID_LOG_TAGS="*:e"`). Tool(globalSoong.Profman). - Flag("--generate-boot-profile"). + Flag("--output-profile-type=bprof"). FlagWithInput("--create-profile-from=", bootFrameworkProfile). FlagForEachInput("--apk=", image.dexPathsDeps.Paths()). FlagForEachArg("--dex-location=", image.getAnyAndroidVariant().dexLocationsDeps). |