StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iaa44ab3127a4c5201753853f861c608f8a5b7a22
This commit is contained in:
Treehugger Robot
2021-09-15 05:21:48 +00:00
committed by Automerger Merge Worker
parent 463c029e6c faf1826ea9
commit 22c6891939
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/app.go
View File

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