androidmk: support translating all-java-files-under

Change-Id: I4c343f6d8d23d42dddc256ff022016b595bb3841
2015-04-03 16:51:45 -07:00
parent 2fe6687847
commit 16daa921e3
4 changed files with 62 additions and 32 deletions
--- a/androidmk/cmd/androidmk/androidmk.go
+++ b/androidmk/cmd/androidmk/androidmk.go
@@ -343,9 +343,9 @@ func setVariable(file *bpFile, val *mkparser.MakeString, plusequals bool, name s
 	var err error
 	switch typ {
 	case bpparser.List:
-		exp, err = makeToListExpression(val)
+		exp, err = makeToListExpression(val, file.scope)
 	case bpparser.String:
-		exp, err = makeToStringExpression(val)
+		exp, err = makeToStringExpression(val, file.scope)
 	case bpparser.Bool:
 		exp, err = makeToBoolExpression(val)
 	default: