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

Commit 4e0c1d37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use stem when filtering boot jars."

parents 0770a175 1c564cc9

java/base.go

+6 −0
Original line number Diff line number Diff line
@@ -1778,3 +1778,9 @@ type ProvidesUsesLib interface { 
func (j *Module) ProvidesUsesLib() *string {

	return j.usesLibraryProperties.Provides_uses_lib

}



type ModuleWithStem interface {

	Stem() string

}



var _ ModuleWithStem = (*Module)(nil)

java/bootclasspath_fragment.go

+12 −1
Original line number Diff line number Diff line
@@ -496,10 +496,21 @@ func (b *BootclasspathFragmentModule) ClasspathFragmentToConfiguredJarList(ctx a 


	global := dexpreopt.GetGlobalConfig(ctx)



	// Convert content names to their appropriate stems, in case a test library is overriding an actual boot jar

	var stems []string

	for _, name := range b.properties.Contents {

		dep := ctx.GetDirectDepWithTag(name, bootclasspathFragmentContentDepTag)

		if m, ok := dep.(ModuleWithStem); ok {

			stems = append(stems, m.Stem())

		} else {

			ctx.PropertyErrorf("contents", "%v is not a ModuleWithStem", name)

		}

	}



	// 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)

	return global.UpdatableBootJars.Filter(stems)

}



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

java/systemserver_classpath_fragment.go

+12 −1
Original line number Diff line number Diff line
@@ -97,10 +97,21 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo 
func (s *SystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {

	global := dexpreopt.GetGlobalConfig(ctx)



	// Convert content names to their appropriate stems, in case a test library is overriding an actual boot jar

	var stems []string

	for _, name := range s.properties.Contents {

		dep := ctx.GetDirectDepWithTag(name, systemServerClasspathFragmentContentDepTag)

		if m, ok := dep.(ModuleWithStem); ok {

			stems = append(stems, m.Stem())

		} else {

			ctx.PropertyErrorf("contents", "%v is not a ModuleWithStem", name)

		}

	}



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

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

	// updatable jars at runtime.

	return global.UpdatableSystemServerJars.Filter(s.properties.Contents)

	return global.UpdatableSystemServerJars.Filter(stems)

}



type systemServerClasspathFragmentContentDependencyTag struct {