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 am: 2618069b9f

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

Change-Id: Ief138e5873d79c2eecd08defaa9e1ee9f28dcf41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-06 23:30:22 +00:00
committed by Automerger Merge Worker
parent ace2d9884a 2618069b9f
commit 41f189fc81
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

@@ -1663,6 +1663,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() {
@@ -1675,6 +1677,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.
@@ -1696,6 +1700,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)