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

2024-01-18 20:38:13 +00:00
parent f29b80c51f 3a3920129d
commit 193bb8c317
5 changed files with 93 additions and 4 deletions
--- a/java/java.go
+++ b/java/java.go
@@ -2264,6 +2264,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())