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

2017-01-28 00:05:06 +00:00 · 2017-01-28 00:05:06 +00:00 · 5951d3e2bb
parent dc2597d25a 62ea583316
commit 5951d3e2bb
1 changed files with 3 additions and 1 deletions
--- a/androidmk/cmd/androidmk/androidmk.go
+++ b/androidmk/cmd/androidmk/androidmk.go
@ -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 {