Merge "Fix panic when a module has an invalid output path" am: cf6749630a am: 32e5355bab am: b2e53db028 am: faf1826ea9

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826960

Change-Id: Iaa44ab3127a4c5201753853f861c608f8a5b7a22

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,