Fix panic when a module has an invalid output path

dep.OutputFile().Path() can panic if the OutputFile
is invalid, so move more of the code into the check
for validity. This changes the go crash into a
build error.

Bug: 158624492
Test: Apply the patchset 1 of ag/11815659, lunch aosp_x86_64-eng, m
Change-Id: Ic8a728be1b570ac73be7b2b9461676f9fd99c266

parent 2551d253

java/app.go

+10 −10

Original line number	Diff line number	Diff line
		@@ -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,