commit 62ea583316d1ff1b167165762012c7faaf5d086a
author Nan Zhang <nanzhang@google.com> Thu Jan 26 16:59:06 2017 -0800
committer Nan Zhang <nanzhang@google.com> Fri Jan 27 14:07:38 2017 -0800
tree 251ad51e38d3cf849eaf51e0f065283c21ee9b4e
parent 29c69e83dd1ef05e985d5bbee106d4dc29f2ca5e

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

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

Bug: b/34454142
Test: Manual + (m -j blueprint_tools) command
Change-Id: I0766082baa2c2c4020317f975012a476133f4f77

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 {