diff options
Diffstat (limited to 'java/dexpreopt_bootjars.go')
| -rw-r--r-- | java/dexpreopt_bootjars.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 7a77b1596..5c69ff151 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -1217,8 +1217,13 @@ func bootImageProfileRuleCommon(ctx android.ModuleContext, name string, dexFiles return nil } - defaultProfile := "frameworks/base/config/boot-image-profile.txt" - extraProfile := "frameworks/base/config/boot-image-profile-extra.txt" + defaultProfile := "frameworks/base/boot/boot-image-profile.txt" + // If ART is prebuilt, primarily in next release configs, this will still use + // the profile from source which represent the latest code, so it may not + // correspond to the BCP jars in the prebuilt APEX, but this is the profile we + // have access to. + artProfile := "art/build/boot/boot-image-profile.txt" + extraProfile := "frameworks/base/boot/boot-image-profile-extra.txt" rule := android.NewRuleBuilder(pctx, ctx) @@ -1233,6 +1238,9 @@ func bootImageProfileRuleCommon(ctx android.ModuleContext, name string, dexFiles // Return nil and continue without profile. return nil } + if path := android.ExistentPathForSource(ctx, artProfile); path.Valid() { + profiles = append(profiles, path.Path()) + } if path := android.ExistentPathForSource(ctx, extraProfile); path.Valid() { profiles = append(profiles, path.Path()) } @@ -1290,7 +1298,7 @@ func bootFrameworkProfileRule(ctx android.ModuleContext, image *bootImageConfig) return nil, nil } - defaultProfile := "frameworks/base/config/boot-profile.txt" + defaultProfile := "frameworks/base/boot/boot-profile.txt" bootFrameworkProfile := android.PathForSource(ctx, defaultProfile) profile := image.dir.Join(ctx, "boot.bprof") |