diff options
| -rw-r--r-- | java/dexpreopt_bootjars.go | 14 | ||||
| -rw-r--r-- | sdk/bootclasspath_fragment_sdk_test.go | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 704164e08..963bc96b9 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -865,24 +865,12 @@ func bootFrameworkProfileRule(ctx android.ModuleContext, image *bootImageConfig) return nil } - // Some branches like master-art-host don't have frameworks/base, so manually - // handle the case that the default is missing. Those branches won't attempt to build the profile rule, - // and if they do they'll get a missing deps error. defaultProfile := "frameworks/base/config/boot-profile.txt" - path := android.ExistentPathForSource(ctx, defaultProfile) - var bootFrameworkProfile android.Path - var missingDeps []string - if path.Valid() { - bootFrameworkProfile = path.Path() - } else { - missingDeps = append(missingDeps, defaultProfile) - bootFrameworkProfile = android.PathForOutput(ctx, "missing", defaultProfile) - } + bootFrameworkProfile := android.PathForSource(ctx, defaultProfile) profile := image.dir.Join(ctx, "boot.bprof") rule := android.NewRuleBuilder(pctx, ctx) - rule.MissingDeps(missingDeps) rule.Command(). Text(`ANDROID_LOG_TAGS="*:e"`). Tool(globalSoong.Profman). diff --git a/sdk/bootclasspath_fragment_sdk_test.go b/sdk/bootclasspath_fragment_sdk_test.go index dcdf85298..5658f16e3 100644 --- a/sdk/bootclasspath_fragment_sdk_test.go +++ b/sdk/bootclasspath_fragment_sdk_test.go @@ -46,6 +46,8 @@ func TestSnapshotWithBootclasspathFragment_ImageName(t *testing.T) { ], } `), + // Needed for platform_bootclasspath + android.FixtureAddFile("frameworks/base/config/boot-profile.txt", nil), java.FixtureConfigureBootJars("com.android.art:mybootlib"), android.FixtureWithRootAndroidBp(` |