diff options
author | 2017-08-23 17:03:42 -0700 | |
---|---|---|
committer | 2017-08-24 22:59:50 +0000 | |
commit | f3ccfa9b9936b577bad8b40c363b5e0795ad615c (patch) | |
tree | 5db7bf90b5509556714db03d215ab738f10630f7 /androidmk/parser/scope.go | |
parent | d55f4d01d52e393e9cbe66663feff70c920996a6 (diff) |
Fix crash when running androidmk against frameworks/base/Android.mk
The was a variable on the right-hand side of the assignment to
LOCAL_MODULE_CLASS , which wants a non-nil scope
Bug: 64266643
Test: androidmk frameworks/base/Android.mk
Test: androidmk prebuilts/misc/common/ddmlib/Android.mk
Change-Id: I52d33f5e5cb1179f84d4df149ef804268d67f7fb
Diffstat (limited to 'androidmk/parser/scope.go')
-rw-r--r-- | androidmk/parser/scope.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/androidmk/parser/scope.go b/androidmk/parser/scope.go index 5e94ea583..60efac275 100644 --- a/androidmk/parser/scope.go +++ b/androidmk/parser/scope.go @@ -1,6 +1,8 @@ package parser -import "strings" +import ( + "strings" +) type Scope interface { Get(name string) string @@ -84,6 +86,9 @@ func (v Variable) Value(scope Scope) string { if ret, ok := v.EvalFunction(scope); ok { return ret } + if scope == nil { + panic("Cannot take the value of a variable in a nil scope") + } return scope.Get(v.Name.Value(scope)) } |