commit | 1323877b7ed8dea3e0da4ba15fa13aaa04aaec5c | [log] [tgz] |
---|---|---|
author | Cole Faust <colefaust@google.com> | Thu Apr 28 14:29:57 2022 -0700 |
committer | Cole Faust <colefaust@google.com> | Tue May 10 05:26:35 2022 +0000 |
tree | 60b024e7d0b50d316ba570d0c5591afad3e4ec11 | |
parent | 85f8fa2c20e90c9e67ce59768b2d19e857ad72cf [diff] [blame] |
Support complicated variable references Bug: 226974242 Test: go test Change-Id: Iaec16f5c498e7c75c9ee5d53d3499efadfba16bc
diff --git a/androidmk/parser/make_strings.go b/androidmk/parser/make_strings.go index 416e430..8afbe7e 100644 --- a/androidmk/parser/make_strings.go +++ b/androidmk/parser/make_strings.go
@@ -234,10 +234,10 @@ 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])