tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Catched the error when bpparser encountered the non-standard make variables.

Bug: b/34454142
Test: Manual + (m -j blueprint_tools) command
Change-Id: I0766082baa2c2c4020317f975012a476133f4f77
This commit is contained in:
Nan Zhang 2017-01-26 16:59:06 -08:00
parent 29c69e83dd
commit 62ea583316
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
androidmk/cmd/androidmk/androidmk.go
View file

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