commit 5951d3e2bba6c6a5e26728f51942c17954bacb2c
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jan 28 00:05:06 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 28 00:05:07 2017 +0000
tree 7ac58e459f8d645bfbf4139b39c814397125561e
parent dc2597d25a453cd26b99754efedc1101f114b2b8
parent 62ea583316d1ff1b167165762012c7faaf5d086a

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

androidmk/cmd/androidmk/androidmk.go

diff --git a/androidmk/cmd/androidmk/androidmk.go b/androidmk/cmd/androidmk/androidmk.go
index bc3295a..729e4f2 100644
--- a/androidmk/cmd/androidmk/androidmk.go
+++ b/androidmk/cmd/androidmk/androidmk.go
@@ -261,7 +261,9 @@
 		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 {