summaryrefslogtreecommitdiff
path: root/androidmk/parser/make_strings.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2022-04-28 14:29:57 -0700
committer Cole Faust <colefaust@google.com> 2022-05-10 05:26:35 +0000
commit1323877b7ed8dea3e0da4ba15fa13aaa04aaec5c (patch)
tree60b024e7d0b50d316ba570d0c5591afad3e4ec11 /androidmk/parser/make_strings.go
parent85f8fa2c20e90c9e67ce59768b2d19e857ad72cf (diff)
Support complicated variable references
Bug: 226974242 Test: go test Change-Id: Iaec16f5c498e7c75c9ee5d53d3499efadfba16bc
Diffstat (limited to 'androidmk/parser/make_strings.go')
-rw-r--r--androidmk/parser/make_strings.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/androidmk/parser/make_strings.go b/androidmk/parser/make_strings.go
index 416e43005..8afbe7edc 100644
--- a/androidmk/parser/make_strings.go
+++ b/androidmk/parser/make_strings.go
@@ -234,10 +234,10 @@ func (ms *MakeString) splitNFunc(n int, splitFunc func(s string, n int) []string
if n != 0 {
split := splitFunc(s, n)
if n != -1 {
- if len(split) > n {
+ if len(split) > n || len(split) == 0 {
panic("oops!")
} else {
- n -= len(split)
+ n -= len(split) - 1
}
}
curMs.appendString(split[0])