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

Merge "Remove option to create boot image based on preloaded classes"

Browse Source
This commit is contained in:
Mathieu Chartier
2019-06-26 15:56:36 +00:00
committed by Gerrit Code Review
parent 02f6880c27 4a0473175e
commit e2a8e7f0ec
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/dexpreopt_bootjars.go
View File

@@ -286,8 +286,6 @@ func buildBootImageRuleForArch(ctx android.SingletonContext, image *bootImage,
if profile != nil {
cmd.FlagWithArg("--compiler-filter=", "speed-profile")
cmd.FlagWithInput("--profile-file=", profile)
} else if global.PreloadedClasses.Valid() {
cmd.FlagWithInput("--image-classes=", global.PreloadedClasses.Path())
}
if global.DirtyImageObjects.Valid() {
@@ -374,7 +372,7 @@ Rebuild with ART_BOOT_IMAGE_EXTRA_ARGS="--runtime-arg -verbose:verifier" to see
func bootImageProfileRule(ctx android.SingletonContext, image *bootImage, missingDeps []string) android.WritablePath {
global := dexpreoptGlobalConfig(ctx)
if !global.UseProfileForBootImage || ctx.Config().IsPdkBuild() || ctx.Config().UnbundledBuild() {
if ctx.Config().IsPdkBuild() || ctx.Config().UnbundledBuild() {
return nil
}
return ctx.Config().Once(bootImageProfileRuleKey, func() interface{} {

1
java/dexpreopt_bootjars_test.go
View File

@@ -62,6 +62,7 @@ func TestDexpreoptBootJars(t *testing.T) {
bootArt := dexpreoptBootJars.Output("boot.art")
expectedInputs := []string{
"dex_bootjars/boot.prof",
"dex_bootjars_input/foo.jar",
"dex_bootjars_input/bar.jar",
"dex_bootjars_input/baz.jar",