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

Merge "Fix ravenizer when transitive classpath is enabled" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-09-06 23:06:52 +00:00
committed by Gerrit Code Review
parent 219009f606 7e86385f1b
commit 2618069b9f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/base.go
View File

@@ -1668,6 +1668,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath
Output: ravenizerOutput, Output: ravenizerOutput,
}) })
outputFile = ravenizerOutput outputFile = ravenizerOutput
localImplementationJars = android.Paths{ravenizerOutput}
completeStaticLibsImplementationJars = android.NewDepSet(android.PREORDER, localImplementationJars, nil)
} }
if j.shouldApiMapper() { if j.shouldApiMapper() {
@@ -1680,6 +1682,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath
Output: apiMapperFile, Output: apiMapperFile,
}) })
outputFile = apiMapperFile outputFile = apiMapperFile
localImplementationJars = android.Paths{apiMapperFile}
completeStaticLibsImplementationJars = android.NewDepSet(android.PREORDER, localImplementationJars, nil)
} }
// Check package restrictions if necessary. // Check package restrictions if necessary.
@@ -1701,6 +1705,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath
Validation: pkgckFile, Validation: pkgckFile,
}) })
outputFile = packageCheckOutputFile outputFile = packageCheckOutputFile
localImplementationJars = android.Paths{packageCheckOutputFile}
completeStaticLibsImplementationJars = android.NewDepSet(android.PREORDER, localImplementationJars, nil)
// Check packages and create a timestamp file when complete. // Check packages and create a timestamp file when complete.
CheckJarPackages(ctx, pkgckFile, outputFile, j.properties.Permitted_packages) CheckJarPackages(ctx, pkgckFile, outputFile, j.properties.Permitted_packages)