Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf674963 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 7b32612d 64cb7c96

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,