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

Commit de534414 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Ulya Trafimovich
Browse files

Revert^4 "Package dexpreopt artifacts for libcore jars in the ART apex." 

This reverts commit bf0e4764.

Reason for revert: coverage build with EMMA_INSTRUMENT_FRAMEWORK=true
is fixed by inspecting the environment variable and not generating
boot image in case it is set.

Dexpreopt artifacts for the libcore part of the boot class path are
now packaged in the ART apex. The system image still contains
dexpreopt artifacts for the full set of boot class path libraries
(both libcore and framework); the libcore part will be removed and
boot image extension will be used in a follow-up CL.

Since this is specific to the ART apex and makes no sense for other
apexes, the implementation adds a boolean flag "is ART apex" rather
than a new apex module property.

Build rules for the new set of dexpreopt artifacts are created using
a new variant of the global boot image config. Previously we had two
variants: "default" (for the system image) and "apex" (for the
JIT-zygote experiment). This patch adds a third "art" variant.

Test: m
Test: m art/build/apex/runtests.sh

Bug: 144091989
Change-Id: I113c0d39222d6d697cb62cd09d5010607872fc2b
parent 1f38237c

apex/apex.go

+16 −1
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ type apexBundle struct { 


	testApex        bool

	vndkApex        bool

	artApex         bool

	primaryApexType bool



	// intermediate path for apex_manifest.json
@@ -1244,6 +1245,19 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		return false

	})



	// Specific to the ART apex: dexpreopt artifacts for libcore Java libraries.

	// Build rules are generated by the dexpreopt singleton, and here we access build artifacts

	// via the global boot image config.

	if a.artApex {

		for arch, files := range java.DexpreoptedArtApexJars(ctx) {

			dirInApex := filepath.Join("javalib", arch.String())

			for _, f := range files {

				localModule := "javalib_" + arch.String() + "_" + filepath.Base(f.String())

				filesInfo = append(filesInfo, apexFile{f, localModule, dirInApex, etc, nil, nil})

			}

		}

	}



	if a.private_key_file == nil {

		ctx.PropertyErrorf("key", "private_key for %q could not be found", String(a.properties.Key))

		return
@@ -1832,9 +1846,10 @@ func newApexBundle() *apexBundle { 
	return module

}



func ApexBundleFactory(testApex bool) android.Module {

func ApexBundleFactory(testApex bool, artApex bool) android.Module {

	bundle := newApexBundle()

	bundle.testApex = testApex

	bundle.artApex = artApex

	return bundle

}

java/dexpreopt_bootjars.go

+38 −23
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ func init() { 


type bootImageConfig struct {

	name         string

	stem         string

	modules      []string

	dexLocations []string

	dexPaths     android.WritablePaths
@@ -71,7 +72,7 @@ func (image bootImageConfig) moduleFiles(ctx android.PathContext, dir android.Ou 
	// In addition, each .art file has an associated .oat and .vdex file, and an

	// unstripped .oat file

	for i, m := range image.modules {

		name := image.name

		name := image.stem

		if i != 0 {

			name += "-" + stemOf(m)

		}
@@ -139,6 +140,12 @@ func skipDexpreoptBootJars(ctx android.PathContext) bool { 
	return false

}



func skipDexpreoptArtBootJars(ctx android.BuilderContext) bool {

	// with EMMA_INSTRUMENT_FRAMEWORK=true ART boot class path libraries have dependencies on framework,

	// therefore dexpreopt ART libraries cannot be dexpreopted in isolation => no ART boot image

	return ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK")

}



type dexpreoptBootJars struct {

	defaultBootImage *bootImage

	otherImages      []*bootImage
@@ -146,6 +153,14 @@ type dexpreoptBootJars struct { 
	dexpreoptConfigForMake android.WritablePath

}



// Accessor function for the apex package. Returns nil if dexpreopt is disabled.

func DexpreoptedArtApexJars(ctx android.BuilderContext) map[android.ArchType]android.Paths {

	if skipDexpreoptBootJars(ctx) || skipDexpreoptArtBootJars(ctx) {

		return nil

	}

	return artBootImageConfig(ctx).imagesDeps

}



// dexpreoptBoot singleton rules

func (d *dexpreoptBootJars) GenerateBuildActions(ctx android.SingletonContext) {

	if skipDexpreoptBootJars(ctx) {
@@ -169,7 +184,12 @@ func (d *dexpreoptBootJars) GenerateBuildActions(ctx android.SingletonContext) { 


	// Always create the default boot image first, to get a unique profile rule for all images.

	d.defaultBootImage = buildBootImage(ctx, defaultBootImageConfig(ctx))

	if !skipDexpreoptArtBootJars(ctx) {

		// Create boot image for the ART apex (build artifacts are accessed via the global boot image config).

		buildBootImage(ctx, artBootImageConfig(ctx))

	}

	if global.GenerateApexImage {

		// Create boot images for the JIT-zygote experiment.

		d.otherImages = append(d.otherImages, buildBootImage(ctx, apexBootImageConfig(ctx)))

	}
@@ -178,8 +198,6 @@ func (d *dexpreoptBootJars) GenerateBuildActions(ctx android.SingletonContext) { 


// buildBootImage takes a bootImageConfig, creates rules to build it, and returns a *bootImage.

func buildBootImage(ctx android.SingletonContext, config bootImageConfig) *bootImage {

	global := dexpreoptGlobalConfig(ctx)



	image := newBootImage(ctx, config)



	bootDexJars := make(android.Paths, len(image.modules))
@@ -223,13 +241,10 @@ func buildBootImage(ctx android.SingletonContext, config bootImageConfig) *bootI 
	bootFrameworkProfileRule(ctx, image, missingDeps)



	var allFiles android.Paths



	if !global.DisablePreopt {

	for _, target := range image.targets {

		files := buildBootImageRuleForArch(ctx, image, target.Arch.ArchType, profile, missingDeps)

		allFiles = append(allFiles, files.Paths()...)

	}

	}



	if image.zip != nil {

		rule := android.NewRuleBuilder()
@@ -251,7 +266,7 @@ func buildBootImageRuleForArch(ctx android.SingletonContext, image *bootImage, 
	global := dexpreoptGlobalConfig(ctx)



	symbolsDir := image.symbolsDir.Join(ctx, "system/framework", arch.String())

	symbolsFile := symbolsDir.Join(ctx, image.name+".oat")

	symbolsFile := symbolsDir.Join(ctx, image.stem+".oat")

	outputDir := image.dir.Join(ctx, "system/framework", arch.String())

	outputPath := image.images[arch]

	oatLocation := pathtools.ReplaceExtension(dexpreopt.PathToLocation(outputPath, arch), "oat")
@@ -381,8 +396,9 @@ func bootImageProfileRule(ctx android.SingletonContext, image *bootImage, missin 
	if global.DisableGenerateProfile || ctx.Config().IsPdkBuild() || ctx.Config().UnbundledBuild() {

		return nil

	}

	return ctx.Config().Once(bootImageProfileRuleKey, func() interface{} {

	profile := ctx.Config().Once(bootImageProfileRuleKey, func() interface{} {

		tools := global.Tools

		defaultProfile := "frameworks/base/config/boot-image-profile.txt"



		rule := android.NewRuleBuilder()

		rule.MissingDeps(missingDeps)
@@ -394,18 +410,13 @@ func bootImageProfileRule(ctx android.SingletonContext, image *bootImage, missin 
			bootImageProfile = combinedBootImageProfile

		} else if len(global.BootImageProfiles) == 1 {

			bootImageProfile = global.BootImageProfiles[0]

		} else {

			// If not set, use the default.  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-image-profile.txt"

			path := android.ExistentPathForSource(ctx, defaultProfile)

			if path.Valid() {

		} else if path := android.ExistentPathForSource(ctx, defaultProfile); path.Valid() {

			bootImageProfile = path.Path()

		} else {

				missingDeps = append(missingDeps, defaultProfile)

				bootImageProfile = android.PathForOutput(ctx, "missing")

			}

			// No profile (not even a default one, which is the case on some branches

			// like master-art-host that don't have frameworks/base).

			// Return nil and continue without profile.

			return nil

		}



		profile := image.dir.Join(ctx, "boot.prof")
@@ -425,7 +436,11 @@ func bootImageProfileRule(ctx android.SingletonContext, image *bootImage, missin 
		image.profileInstalls = rule.Installs()



		return profile

	}).(android.WritablePath)

	})

	if profile == nil {

		return nil // wrap nil into a typed pointer with value nil

	}

	return profile.(android.WritablePath)

}



var bootImageProfileRuleKey = android.NewOnceKey("bootImageProfileRule")

java/dexpreopt_bootjars_test.go

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ 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",

java/dexpreopt_config.go

+35 −13
Original line number Diff line number Diff line
@@ -106,15 +106,20 @@ func stemOf(moduleName string) string { 
	return moduleName

}



func getBootImageConfig(ctx android.PathContext, key android.OnceKey, name string,

	needZip bool) bootImageConfig {

// Construct a variant of the global config for dexpreopted bootclasspath jars. The variants differ

// in the list of input jars (libcore, framework, or both), in the naming scheme for the dexpreopt

// files (ART recognizes "apex" names as special), and whether to include a zip archive.

//

// 'name' is a string unique for each profile (used in directory names and ninja rule names)

// 'stem' is the basename of the image: the resulting filenames are <stem>[-<jar>].{art,oat,vdex}.

func getBootImageConfig(ctx android.PathContext, key android.OnceKey, name string, stem string,

	needZip bool, artApexJarsOnly bool) bootImageConfig {



	return ctx.Config().Once(key, func() interface{} {

		global := dexpreoptGlobalConfig(ctx)



		artModules := global.ArtApexJars

		nonFrameworkModules := concat(artModules, global.ProductUpdatableBootModules)

		frameworkModules := android.RemoveListFromList(global.BootJars, nonFrameworkModules)

		imageModules := concat(artModules, frameworkModules)

		imageModules := artModules



		var bootLocations []string
@@ -123,10 +128,16 @@ func getBootImageConfig(ctx android.PathContext, key android.OnceKey, name strin 
				filepath.Join("/apex/com.android.art/javalib", stemOf(m)+".jar"))

		}



		if !artApexJarsOnly {

			nonFrameworkModules := concat(artModules, global.ProductUpdatableBootModules)

			frameworkModules := android.RemoveListFromList(global.BootJars, nonFrameworkModules)

			imageModules = concat(imageModules, frameworkModules)



			for _, m := range frameworkModules {

				bootLocations = append(bootLocations,

					filepath.Join("/system/framework", stemOf(m)+".jar"))

			}

		}



		// The path to bootclasspath dex files needs to be known at module GenerateAndroidBuildAction time, before

		// the bootclasspath modules have been compiled.  Set up known paths for them, the singleton rules will copy
@@ -143,13 +154,14 @@ func getBootImageConfig(ctx android.PathContext, key android.OnceKey, name strin 


		var zip android.WritablePath

		if needZip {

			zip = dir.Join(ctx, name+".zip")

			zip = dir.Join(ctx, stem+".zip")

		}



		targets := dexpreoptTargets(ctx)



		imageConfig := bootImageConfig{

			name:         name,

			stem:         stem,

			modules:      imageModules,

			dexLocations: bootLocations,

			dexPaths:     bootDexPaths,
@@ -163,7 +175,7 @@ func getBootImageConfig(ctx android.PathContext, key android.OnceKey, name strin 


		for _, target := range targets {

			imageDir := dir.Join(ctx, "system/framework", target.Arch.ArchType.String())

			imageConfig.images[target.Arch.ArchType] = imageDir.Join(ctx, name+".art")

			imageConfig.images[target.Arch.ArchType] = imageDir.Join(ctx, stem+".art")



			imagesDeps := make([]android.Path, 0, len(imageConfig.modules)*3)

			for _, dep := range imageConfig.moduleFiles(ctx, imageDir, ".art", ".oat", ".vdex") {
@@ -176,15 +188,25 @@ func getBootImageConfig(ctx android.PathContext, key android.OnceKey, name strin 
	}).(bootImageConfig)

}



// Default config is the one that goes in the system image. It includes both libcore and framework.

var defaultBootImageConfigKey = android.NewOnceKey("defaultBootImageConfig")

var apexBootImageConfigKey = android.NewOnceKey("apexBootImageConfig")



func defaultBootImageConfig(ctx android.PathContext) bootImageConfig {

	return getBootImageConfig(ctx, defaultBootImageConfigKey, "boot", true)

	return getBootImageConfig(ctx, defaultBootImageConfigKey, "boot", "boot", true, false)

}



// Apex config is used for the JIT-zygote experiment. It includes both libcore and framework, but AOT-compiles only libcore.

var apexBootImageConfigKey = android.NewOnceKey("apexBootImageConfig")



func apexBootImageConfig(ctx android.PathContext) bootImageConfig {

	return getBootImageConfig(ctx, apexBootImageConfigKey, "apex", false)

	return getBootImageConfig(ctx, apexBootImageConfigKey, "apex", "apex", false, false)

}



// ART config is the one used for the ART apex. It includes only libcore.

var artBootImageConfigKey = android.NewOnceKey("artBootImageConfig")



func artBootImageConfig(ctx android.PathContext) bootImageConfig {

	return getBootImageConfig(ctx, artBootImageConfigKey, "art", "boot", false, true)

}



func defaultBootclasspath(ctx android.PathContext) []string {