diff options
author | 2021-06-17 11:43:37 +0000 | |
---|---|---|
committer | 2021-06-17 11:43:37 +0000 | |
commit | 68c8dd019ce159b738f5a0925f7e3cb875ef0221 (patch) | |
tree | c9d8d725b36851582edecaf0c5f52c6eb7b2bc87 /java/platform_bootclasspath.go | |
parent | 2d16ec5af71ae0d12191dc71a61c1025fa53dc95 (diff) | |
parent | 142ed27e32dd59db9afec59a13d49a230657f662 (diff) |
Merge "Rename ClasspathFragmentToConfiguredJarList methods to configuredJars."
Diffstat (limited to 'java/platform_bootclasspath.go')
-rw-r--r-- | java/platform_bootclasspath.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index fba73d0c1..1a4f9b7ec 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -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 } |