diff options
| author | 2024-01-17 18:26:27 +0000 | |
|---|---|---|
| committer | 2024-01-17 20:59:43 +0000 | |
| commit | 3a3920129dc42a143da1c28c440a25a74be78589 (patch) | |
| tree | 7ebe10717e50acedf2f68f4d3142f55b942223dc /java/hiddenapi_modular.go | |
| parent | 1c4cc3d40e0081a065d44b0172e66fb58b1967a1 (diff) | |
Add better error handling to bootDexJar function
aosp/2876754 missed adding error handling to one of the places which
consumes the dex jar deapexed from prebuilt apexes. This CL ensures that
when we have multiple prebuilt apexes _without_ flagging, the hiddenapi
processing code emits a more descriptive error "Multiple deapxers..."
rather than a cryptic error "<module> does not provide a dex jar"
Test: m nothing --no-skip-soong-tests
Change-Id: I80849fa7cca17d724ac53c94bb353b169175ee28
Diffstat (limited to 'java/hiddenapi_modular.go')
| -rw-r--r-- | java/hiddenapi_modular.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index a51286064..517669223 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -1342,7 +1342,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()) |