StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename classpath_fragment.go methods for better readability. am: 128ce2ff73

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697680

Change-Id: I188173f7ce1d1698a5a0244afa9eb11f738062c9
This commit is contained in:
satayev
2021-05-06 14:36:37 +00:00
committed by Automerger Merge Worker
parent fb5c5cd8ee 128ce2ff73
commit 0309f55c23
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/classpath_fragment.go
View File

@@ -81,7 +81,7 @@ type classpathJar struct {
maxSdkVersion int32 maxSdkVersion int32
} }
func (c *ClasspathFragmentBase) generateAndroidBuildActions(ctx android.ModuleContext) { func (c *ClasspathFragmentBase) generateClasspathProtoBuildActions(ctx android.ModuleContext) {
outputFilename := ctx.ModuleName() + ".pb" outputFilename := ctx.ModuleName() + ".pb"
c.outputFilepath = android.PathForModuleOut(ctx, outputFilename).OutputPath c.outputFilepath = android.PathForModuleOut(ctx, outputFilename).OutputPath
c.installDirPath = android.PathForModuleInstall(ctx, "etc", "classpaths") c.installDirPath = android.PathForModuleInstall(ctx, "etc", "classpaths")
@@ -137,7 +137,7 @@ func appendClasspathJar(slice []classpathJar, classpathType classpathType, paths
return return
} }
func (c *ClasspathFragmentBase) getAndroidMkEntries() []android.AndroidMkEntries { func (c *ClasspathFragmentBase) androidMkEntries() []android.AndroidMkEntries {
return []android.AndroidMkEntries{android.AndroidMkEntries{ return []android.AndroidMkEntries{android.AndroidMkEntries{
Class: "ETC", Class: "ETC",
OutputFile: android.OptionalPathForPath(c.outputFilepath), OutputFile: android.OptionalPathForPath(c.outputFilepath),

4
java/platform_bootclasspath.go
View File

@@ -87,7 +87,7 @@ func (b *platformBootclasspathModule) AndroidMkEntries() (entries []android.Andr
OutputFile: android.OptionalPathForPath(b.hiddenAPIFlagsCSV), OutputFile: android.OptionalPathForPath(b.hiddenAPIFlagsCSV),
Include: "$(BUILD_PHONY_PACKAGE)", Include: "$(BUILD_PHONY_PACKAGE)",
}) })
entries = append(entries, b.classpathFragmentBase().getAndroidMkEntries()...) entries = append(entries, b.classpathFragmentBase().androidMkEntries()...)
return return
} }
@@ -167,7 +167,7 @@ func (d *platformBootclasspathModule) MakeVars(ctx android.MakeVarsContext) {
} }
func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) { 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. // Gather all the dependencies from the art, updatable and non-updatable boot jars.
artModules := gatherApexModulePairDepsWithTag(ctx, platformBootclasspathArtBootJarDepTag) artModules := gatherApexModulePairDepsWithTag(ctx, platformBootclasspathArtBootJarDepTag)