diff options
author | 2024-01-17 18:26:27 +0000 | |
---|---|---|
committer | 2024-01-17 20:59:43 +0000 | |
commit | 3a3920129dc42a143da1c28c440a25a74be78589 (patch) | |
tree | 7ebe10717e50acedf2f68f4d3142f55b942223dc /java/sdk_library.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/sdk_library.go')
-rw-r--r-- | java/sdk_library.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 058862b43..ce94ff98e 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -2769,6 +2769,7 @@ func (module *SdkLibraryImport) GenerateAndroidBuildActions(ctx android.ModuleCo // 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 module.dexJarFileErr = err + module.initHiddenAPIError(err) return } dexJarFileApexRootRelative := ApexRootRelativePathToJavaLib(module.BaseModuleName()) |