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

Merge "Rename ClasspathFragmentToConfiguredJarList methods to configuredJars."

Browse Source
This commit is contained in:
satayev
2021-06-17 11:43:37 +00:00
committed by Gerrit Code Review
parent 2d16ec5af7 142ed27e32
commit 68c8dd019c
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/bootclasspath_fragment.go
View File

@@ -488,14 +488,14 @@ func (b *BootclasspathFragmentModule) generateClasspathProtoBuildActions(ctx and
var classpathJars []classpathJar var classpathJars []classpathJar
if "art" == proptools.String(b.properties.Image_name) { if "art" == proptools.String(b.properties.Image_name) {
// 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.configuredJars(ctx), BOOTCLASSPATH, DEX2OATBOOTCLASSPATH)
} else { } else {
classpathJars = configuredJarListToClasspathJars(ctx, b.ClasspathFragmentToConfiguredJarList(ctx), b.classpathType) classpathJars = configuredJarListToClasspathJars(ctx, b.configuredJars(ctx), b.classpathType)
} }
b.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars) 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) { if "art" == proptools.String(b.properties.Image_name) {
return b.getImageConfig(ctx).modules return b.getImageConfig(ctx).modules
} }

4
java/classpath_fragment.go
View File

@@ -52,10 +52,6 @@ type classpathFragment interface {
android.Module android.Module
classpathFragmentBase() *ClasspathFragmentBase 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; // ClasspathFragmentBase is meant to be embedded in any module types that implement classpathFragment;

4
java/platform_bootclasspath.go
View File

@@ -202,11 +202,11 @@ func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.Mo
// Generate classpaths.proto config // Generate classpaths.proto config
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.configuredJars(ctx), BOOTCLASSPATH, DEX2OATBOOTCLASSPATH)
b.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars) 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 return b.getImageConfig(ctx).modules
} }

8
java/systemserver_classpath_fragment.go
View File

@@ -48,11 +48,11 @@ func (p *platformSystemServerClasspathModule) AndroidMkEntries() (entries []andr
} }
func (p *platformSystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) { 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) 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) global := dexpreopt.GetGlobalConfig(ctx)
return global.SystemServerJars return global.SystemServerJars
} }
@@ -91,11 +91,11 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo
ctx.PropertyErrorf("contents", "empty contents are not allowed") 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) 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) global := dexpreopt.GetGlobalConfig(ctx)
// Convert content names to their appropriate stems, in case a test library is overriding an actual boot jar // Convert content names to their appropriate stems, in case a test library is overriding an actual boot jar