diff options
| author | 2024-01-17 18:26:27 +0000 | |
|---|---|---|
| committer | 2024-01-17 20:59:43 +0000 | |
| commit | 3a3920129dc42a143da1c28c440a25a74be78589 (patch) | |
| tree | 7ebe10717e50acedf2f68f4d3142f55b942223dc /java/java.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/java.go')
| -rw-r--r-- | java/java.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 4eeded386..807aea97d 100644 --- a/java/java.go +++ b/java/java.go @@ -2258,6 +2258,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { // An error was found, possibly due to multiple apexes in the tree that export this library // Defer the error till a client tries to call DexJarBuildPath j.dexJarFileErr = err + j.initHiddenAPIError(err) return } dexJarFileApexRootRelative := ApexRootRelativePathToJavaLib(j.BaseModuleName()) |