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

Merge "Fixed androidmk crash when parsing external/aac/Android.mk"

Browse Source
This commit is contained in:
Treehugger Robot
2017-01-28 00:05:06 +00:00
committed by Gerrit Code Review
parent dc2597d25a 62ea583316
commit 5951d3e2bb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
androidmk/cmd/androidmk/androidmk.go
View File

@@ -261,9 +261,11 @@ func handleAssignment(file *bpFile, assignment *mkparser.Assignment, c *conditio
default: default:
var val bpparser.Expression var val bpparser.Expression
val, err = makeVariableToBlueprint(file, assignment.Value, bpparser.ListType) val, err = makeVariableToBlueprint(file, assignment.Value, bpparser.ListType)
if err == nil {
err = setVariable(file, appendVariable, prefix, name, val, false) err = setVariable(file, appendVariable, prefix, name, val, false)
} }
} }
}
if err != nil { if err != nil {
file.errorf(assignment, err.Error()) file.errorf(assignment, err.Error())
} }