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

Merge "Add better error handling to bootDexJar function" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-01-18 20:38:13 +00:00
committed by Gerrit Code Review
parent f29b80c51f 3a3920129d
commit 193bb8c317
5 changed files with 93 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/hiddenapi_modular.go
View File

@@ -1357,7 +1357,7 @@ func extractBootDexInfoFromModules(ctx android.ModuleContext, contents []android
// invalid, then create a fake path and either report an error immediately or defer reporting of the
// error until the path is actually used.
func retrieveBootDexJarFromHiddenAPIModule(ctx android.ModuleContext, module hiddenAPIModule) android.Path {
bootDexJar := module.bootDexJar()
bootDexJar := module.bootDexJar(ctx)
if !bootDexJar.Valid() {
fake := android.PathForModuleOut(ctx, fmt.Sprintf("fake/boot-dex/%s.jar", module.Name()))
handleMissingDexBootFile(ctx, module, fake, bootDexJar.InvalidReason())