Merge "Fix panic when a module has an invalid output path"

2021-09-15 04:23:13 +00:00
parent 7b32612dc4 64cb7c964a
commit cf6749630a
1 changed files with 11 additions and 11 deletions
--- a/java/app.go
+++ b/java/app.go
@@ -760,6 +760,7 @@ func collectAppDeps(ctx android.ModuleContext, app appDepsInterface,
 				}

 				lib := dep.OutputFile()
+				if lib.Valid() {
 					path := lib.Path()
 					if seenModulePaths[path.String()] {
 						return false
@@ -771,7 +772,6 @@ func collectAppDeps(ctx android.ModuleContext, app appDepsInterface,
 							otherName)
 					}

-				if lib.Valid() {
 					jniLibs = append(jniLibs, jniLib{
 						name:           ctx.OtherModuleName(module),
 						path:           path,