Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db160c07 authored by Jiakai Zhang's avatar Jiakai Zhang
Browse files

Revert "Generate a boot image extension for mainline BCP jars." 

This reverts commit 3830308f.

Reason for revert: Caused various SH regressions.

Bug: 271036161
Change-Id: Ia785324f83006a095e262c251b24d49fd778427e
parent 3830308f

java/dexpreopt.go

+0 −6
Original line number Diff line number Diff line
@@ -293,12 +293,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr 
	isSystemServerJar := global.AllSystemServerJars(ctx).ContainsJar(moduleName(ctx))



	bootImage := defaultBootImageConfig(ctx)

	// When `global.PreoptWithUpdatableBcp` is true, `bcpForDexpreopt` below includes the mainline

	// boot jars into bootclasspath, so we should include the mainline boot image as well because it's

	// generated from those jars.

	if global.PreoptWithUpdatableBcp {

		bootImage = mainlineBootImageConfig(ctx)

	}

	dexFiles, dexLocations := bcpForDexpreopt(ctx, global.PreoptWithUpdatableBcp)



	targets := ctx.MultiTargets()

java/dexpreopt_config.go

+4 −22
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ var ( 
	bootImageConfigRawKey  = android.NewOnceKey("bootImageConfigRaw")

	artBootImageName       = "art"

	frameworkBootImageName = "boot"

	mainlineBootImageName  = "mainline"

	bootImageStem          = "boot"

)



func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig {
@@ -54,16 +52,14 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig 


		artModules := global.ArtApexJars

		frameworkModules := global.BootJars.RemoveList(artModules)

		mainlineBcpModules := global.ApexBootJars

		frameworkSubdir := "system/framework"



		// ART config for the primary boot image in the ART apex.

		// It includes the Core Libraries.

		artCfg := bootImageConfig{

			name:                     artBootImageName,

			stem:                     bootImageStem,

			stem:                     "boot",

			installDirOnHost:         "apex/art_boot_images/javalib",

			installDirOnDevice:       frameworkSubdir,

			installDirOnDevice:       "system/framework",

			profileInstallPathInApex: "etc/boot-image.prof",

			modules:                  artModules,

			preloadedClassesFile:     "art/build/boot/preloaded-classes",
@@ -72,10 +68,11 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig 


		// Framework config for the boot image extension.

		// It includes framework libraries and depends on the ART config.

		frameworkSubdir := "system/framework"

		frameworkCfg := bootImageConfig{

			extends:              &artCfg,

			name:                 frameworkBootImageName,

			stem:                 bootImageStem,

			stem:                 "boot",

			installDirOnHost:     frameworkSubdir,

			installDirOnDevice:   frameworkSubdir,

			modules:              frameworkModules,
@@ -83,20 +80,9 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig 
			compilerFilter:       "speed-profile",

		}



		mainlineCfg := bootImageConfig{

			extends:            &frameworkCfg,

			name:               mainlineBootImageName,

			stem:               bootImageStem,

			installDirOnHost:   frameworkSubdir,

			installDirOnDevice: frameworkSubdir,

			modules:            mainlineBcpModules,

			compilerFilter:     "verify",

		}



		return map[string]*bootImageConfig{

			artBootImageName:       &artCfg,

			frameworkBootImageName: &frameworkCfg,

			mainlineBootImageName:  &mainlineCfg,

		}

	}).(map[string]*bootImageConfig)

}
@@ -188,10 +174,6 @@ func defaultBootImageConfig(ctx android.PathContext) *bootImageConfig { 
	return genBootImageConfigs(ctx)[frameworkBootImageName]

}



func mainlineBootImageConfig(ctx android.PathContext) *bootImageConfig {

	return genBootImageConfigs(ctx)[mainlineBootImageName]

}



// Apex boot config allows to access build/install paths of apex boot jars without going

// through the usual trouble of registering dependencies on those modules and extracting build paths

// from those dependencies.

java/dexpreopt_config_test.go

+0 −2
Original line number Diff line number Diff line
@@ -28,10 +28,8 @@ func TestBootImageConfig(t *testing.T) { 


	result := android.GroupFixturePreparers(

		PrepareForBootImageConfigTest,

		PrepareApexBootJarConfigs,

	).RunTest(t)



	CheckArtBootImageConfig(t, result)

	CheckFrameworkBootImageConfig(t, result)

	CheckMainlineBootImageConfig(t, result)

}

java/dexpreopt_config_testing.go

+1 −460

File changed.

Preview size limit exceeded, changes collapsed.

java/platform_bootclasspath.go

+0 −1
Original line number Diff line number Diff line
@@ -414,7 +414,6 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android. 
	frameworkBootImageConfig := defaultBootImageConfig(ctx)

	bootFrameworkProfileRule(ctx, frameworkBootImageConfig)

	b.generateBootImage(ctx, frameworkBootImageName, platformModules)

	b.generateBootImage(ctx, mainlineBootImageName, apexModules)

	b.copyApexBootJarsForAppsDexpreopt(ctx, apexModules)

	dumpOatRules(ctx, frameworkBootImageConfig)

}