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

Commit 68c8dd01 authored by satayev's avatar satayev Committed by Gerrit Code Review
Browse files

Merge "Rename ClasspathFragmentToConfiguredJarList methods to configuredJars."

parents 2d16ec5a 142ed27e

java/bootclasspath_fragment.go

+3 −3
Original line number Diff line number Diff line
@@ -488,14 +488,14 @@ func (b *BootclasspathFragmentModule) generateClasspathProtoBuildActions(ctx and 
	var classpathJars []classpathJar

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

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

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

		classpathJars = configuredJarListToClasspathJars(ctx, b.configuredJars(ctx), BOOTCLASSPATH, DEX2OATBOOTCLASSPATH)

	} else {

		classpathJars = configuredJarListToClasspathJars(ctx, b.ClasspathFragmentToConfiguredJarList(ctx), b.classpathType)

		classpathJars = configuredJarListToClasspathJars(ctx, b.configuredJars(ctx), b.classpathType)

	}

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

}



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

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

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

		return b.getImageConfig(ctx).modules

	}

java/classpath_fragment.go

+0 −4
Original line number Diff line number Diff line
@@ -52,10 +52,6 @@ type classpathFragment interface { 
	android.Module



	classpathFragmentBase() *ClasspathFragmentBase



	// ClasspathFragmentToConfiguredJarList returns android.ConfiguredJarList representation of all

	// the jars in this classpath fragment.

	ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList

}



// ClasspathFragmentBase is meant to be embedded in any module types that implement classpathFragment;

java/platform_bootclasspath.go

+2 −2
Original line number Diff line number Diff line
@@ -202,11 +202,11 @@ func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.Mo 
// Generate classpaths.proto config

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

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

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

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

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

}



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

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

	return b.getImageConfig(ctx).modules

}

java/systemserver_classpath_fragment.go

+4 −4
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ func (p *platformSystemServerClasspathModule) AndroidMkEntries() (entries []andr 
}



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

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

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

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

}



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

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

	global := dexpreopt.GetGlobalConfig(ctx)

	return global.SystemServerJars

}
@@ -91,11 +91,11 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo 
		ctx.PropertyErrorf("contents", "empty contents are not allowed")

	}



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

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

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

}



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

func (s *SystemServerClasspathModule) configuredJars(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