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

Commit 8fab6f86 authored by satayev's avatar satayev
Browse files

Populate individual classpath_fragments' classpaths.proto configs. 

To avoid duplicates on *CLASSPATH environ variables at runtime, remove
split entries from platform-*classpath, i.e. all updatable jars that
have their own classpath fragments should not appear in the
platform-*classpath's classpaths.proto config.

Bug: 180105615
Test: m && launch_cvd; atest CtsClasspathsTestCases
Change-Id: Id2759ab8e106cc183e695bf3509a6ab60ab0ef2a
Merged-In: Id2759ab8e106cc183e695bf3509a6ab60ab0ef2a
parent ecf2dc46

android/config.go

+15 −0
Original line number Original line Diff line number Diff line
@@ -1647,6 +1647,21 @@ func (l *ConfiguredJarList) RemoveList(list ConfiguredJarList) ConfiguredJarList 
	return ConfiguredJarList{apexes, jars}

	return ConfiguredJarList{apexes, jars}

}

}





// Filter keeps the entries if a jar appears in the given list of jars to keep; returns a new list.

func (l *ConfiguredJarList) Filter(jarsToKeep []string) ConfiguredJarList {

	var apexes []string

	var jars []string



	for i, jar := range l.jars {

		if InList(jar, jarsToKeep) {

			apexes = append(apexes, l.apexes[i])

			jars = append(jars, jar)

		}

	}



	return ConfiguredJarList{apexes, jars}

}



// CopyOfJars returns a copy of the list of strings containing jar module name

// CopyOfJars returns a copy of the list of strings containing jar module name

// components.

// components.

func (l *ConfiguredJarList) CopyOfJars() []string {

func (l *ConfiguredJarList) CopyOfJars() []string {

java/bootclasspath_fragment.go

+10 −2
Original line number Original line Diff line number Diff line
@@ -447,8 +447,16 @@ func (b *BootclasspathFragmentModule) generateClasspathProtoBuildActions(ctx and 
}

}





func (b *BootclasspathFragmentModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {

func (b *BootclasspathFragmentModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {

	// TODO(satayev): populate with actual content

	if "art" == proptools.String(b.properties.Image_name) {

	return android.EmptyConfiguredJarList()

		return b.getImageConfig(ctx).modules

	}



	global := dexpreopt.GetGlobalConfig(ctx)



	// Only create configs for updatable boot jars. Non-updatable boot jars must be part of the

	// platform_bootclasspath's classpath proto config to guarantee that they come before any

	// updatable jars at runtime.

	return global.UpdatableBootJars.Filter(b.properties.Contents)

}

}





func (b *BootclasspathFragmentModule) getImageConfig(ctx android.EarlyModuleContext) *bootImageConfig {

func (b *BootclasspathFragmentModule) getImageConfig(ctx android.EarlyModuleContext) *bootImageConfig {

java/dexpreopt_config.go

+0 −27
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 
package java

package java





import (

import (

	"fmt"

	"path/filepath"

	"path/filepath"

	"strings"

	"strings"
@@ -23,32 +22,6 @@ import ( 
	"android/soong/dexpreopt"

	"android/soong/dexpreopt"

)

)





// systemServerClasspath returns the on-device locations of the modules in the system server classpath.  It is computed

// once the first time it is called for any ctx.Config(), and returns the same slice for all future calls with the same

// ctx.Config().

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

	return ctx.Config().OnceStringSlice(systemServerClasspathKey, func() []string {

		global := dexpreopt.GetGlobalConfig(ctx)

		var systemServerClasspathLocations []string

		nonUpdatable := dexpreopt.NonUpdatableSystemServerJars(ctx, global)

		// 1) Non-updatable jars.

		for _, m := range nonUpdatable {

			systemServerClasspathLocations = append(systemServerClasspathLocations,

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

		}

		// 2) The jars that are from an updatable apex.

		systemServerClasspathLocations = append(systemServerClasspathLocations,

			global.UpdatableSystemServerJars.DevicePaths(ctx.Config(), android.Android)...)



		if expectedLen := global.SystemServerJars.Len() + global.UpdatableSystemServerJars.Len(); expectedLen != len(systemServerClasspathLocations) {

			panic(fmt.Errorf("wrong number of system server jars, got %d, expected %d", len(systemServerClasspathLocations), expectedLen))

		}

		return systemServerClasspathLocations

	})

}



var systemServerClasspathKey = android.NewOnceKey("systemServerClasspath")



// dexpreoptTargets returns the list of targets that are relevant to dexpreopting, which excludes architectures

// dexpreoptTargets returns the list of targets that are relevant to dexpreopting, which excludes architectures

// supported through native bridge.

// supported through native bridge.

func dexpreoptTargets(ctx android.PathContext) []android.Target {

func dexpreoptTargets(ctx android.PathContext) []android.Target {

java/platform_bootclasspath.go

+1 −8
Original line number Original line Diff line number Diff line
@@ -203,18 +203,11 @@ func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.Mo 
func (b *platformBootclasspathModule) generateClasspathProtoBuildActions(ctx android.ModuleContext) {

func (b *platformBootclasspathModule) generateClasspathProtoBuildActions(ctx android.ModuleContext) {

	// ART and platform boot jars must have a corresponding entry in DEX2OATBOOTCLASSPATH

	// ART and platform boot jars must have a corresponding entry in DEX2OATBOOTCLASSPATH

	classpathJars := configuredJarListToClasspathJars(ctx, b.ClasspathFragmentToConfiguredJarList(ctx), BOOTCLASSPATH, DEX2OATBOOTCLASSPATH)

	classpathJars := configuredJarListToClasspathJars(ctx, b.ClasspathFragmentToConfiguredJarList(ctx), BOOTCLASSPATH, DEX2OATBOOTCLASSPATH)



	// TODO(satayev): remove updatable boot jars once each apex has its own fragment

	global := dexpreopt.GetGlobalConfig(ctx)

	classpathJars = append(classpathJars, configuredJarListToClasspathJars(ctx, global.UpdatableBootJars, BOOTCLASSPATH)...)



	b.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars)

	b.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars)

}

}





func (b *platformBootclasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {

func (b *platformBootclasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {

	global := dexpreopt.GetGlobalConfig(ctx)

	return b.getImageConfig(ctx).modules

	// TODO(satayev): split ART apex jars into their own classpathFragment

	return global.BootJars

}

}





// checkNonUpdatableModules ensures that the non-updatable modules supplied are not part of an

// checkNonUpdatableModules ensures that the non-updatable modules supplied are not part of an

java/systemserver_classpath_fragment.go

+11 −15
Original line number Original line Diff line number Diff line
@@ -47,24 +47,19 @@ func (p *platformSystemServerClasspathModule) AndroidMkEntries() (entries []andr 
}

}





func (p *platformSystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {

func (p *platformSystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	configuredJars := configuredJarListToClasspathJars(ctx, p.ClasspathFragmentToConfiguredJarList(ctx), p.classpathType)

	classpathJars := configuredJarListToClasspathJars(ctx, p.ClasspathFragmentToConfiguredJarList(ctx), p.classpathType)

	p.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, configuredJars)

	p.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars)

}

}





var platformSystemServerClasspathKey = android.NewOnceKey("platform_systemserverclasspath")



func (p *platformSystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {

func (p *platformSystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {

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

	global := dexpreopt.GetGlobalConfig(ctx)

	global := dexpreopt.GetGlobalConfig(ctx)





	jars := global.SystemServerJars

	jars := global.SystemServerJars



	// TODO(satayev): split apex jars into separate configs.

	// TODO(satayev): split apex jars into separate configs.

	for i := 0; i < global.UpdatableSystemServerJars.Len(); i++ {

	for i := 0; i < global.UpdatableSystemServerJars.Len(); i++ {

		jars = jars.Append(global.UpdatableSystemServerJars.Apex(i), global.UpdatableSystemServerJars.Jar(i))

		jars = jars.Append(global.UpdatableSystemServerJars.Apex(i), global.UpdatableSystemServerJars.Jar(i))

	}

	}

	return jars

	return jars

	}).(android.ConfiguredJarList)

}

}





type SystemServerClasspathModule struct {

type SystemServerClasspathModule struct {
@@ -101,7 +96,8 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo 
		ctx.PropertyErrorf("contents", "empty contents are not allowed")

		ctx.PropertyErrorf("contents", "empty contents are not allowed")

	}

	}





	s.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, configuredJarListToClasspathJars(ctx, s.ClasspathFragmentToConfiguredJarList(ctx)))

	classpathJars := configuredJarListToClasspathJars(ctx, s.ClasspathFragmentToConfiguredJarList(ctx), s.classpathType)

	s.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars)

}

}





func (s *SystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {

func (s *SystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {