Merge "Fix panic when a module has an invalid output path" am: cf6749630a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826960 Change-Id: I972bbb9b99121e1ee4ffb33c0278f239dd61db8f
This commit is contained in:
@@ -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,
|
||||
|
Reference in New Issue
Block a user