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

Commit 128ce2ff authored by satayev's avatar satayev
Browse files

Rename classpath_fragment.go methods for better readability. 

Bug: 180105615
Test: m nothing
Change-Id: Ic663c22e5b7cbab487dc1fe99805e08843c3213d
parent 63bc30fc

java/classpath_fragment.go

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ type classpathJar struct { 
	maxSdkVersion int32

}



func (c *ClasspathFragmentBase) generateAndroidBuildActions(ctx android.ModuleContext) {

func (c *ClasspathFragmentBase) generateClasspathProtoBuildActions(ctx android.ModuleContext) {

	outputFilename := ctx.ModuleName() + ".pb"

	c.outputFilepath = android.PathForModuleOut(ctx, outputFilename).OutputPath

	c.installDirPath = android.PathForModuleInstall(ctx, "etc", "classpaths")
@@ -137,7 +137,7 @@ func appendClasspathJar(slice []classpathJar, classpathType classpathType, paths 
	return

}



func (c *ClasspathFragmentBase) getAndroidMkEntries() []android.AndroidMkEntries {

func (c *ClasspathFragmentBase) androidMkEntries() []android.AndroidMkEntries {

	return []android.AndroidMkEntries{android.AndroidMkEntries{

		Class:      "ETC",

		OutputFile: android.OptionalPathForPath(c.outputFilepath),

java/platform_bootclasspath.go

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ func (b *platformBootclasspathModule) AndroidMkEntries() (entries []android.Andr 
		OutputFile: android.OptionalPathForPath(b.hiddenAPIFlagsCSV),

		Include:    "$(BUILD_PHONY_PACKAGE)",

	})

	entries = append(entries, b.classpathFragmentBase().getAndroidMkEntries()...)

	entries = append(entries, b.classpathFragmentBase().androidMkEntries()...)

	return

}
@@ -167,7 +167,7 @@ func (d *platformBootclasspathModule) MakeVars(ctx android.MakeVarsContext) { 
}



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

	b.classpathFragmentBase().generateAndroidBuildActions(ctx)

	b.classpathFragmentBase().generateClasspathProtoBuildActions(ctx)



	// Gather all the dependencies from the art, updatable and non-updatable boot jars.

	artModules := gatherApexModulePairDepsWithTag(ctx, platformBootclasspathArtBootJarDepTag)