Merge "Fixed androidmk crash when parsing external/aac/Android.mk" am: 5951d3e2bb

am: 67d5fc5e49 Change-Id: I2fe464be21ad6b5e75d383411a24ba9aa7450e66
2017-01-28 00:10:18 +00:00
parent 50cc75da63 67d5fc5e49
commit 95e16a6b6f
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 {