diff options
| author | Siluxsept <ronny.horn.rh@gmail.com> | 2022-02-18 10:29:04 +0100 |
|---|---|---|
| committer | George Zacharia <george.zcharia@gmail.com> | 2022-02-19 20:41:41 +0530 |
| commit | 1ad75e9c3e1cdac8bf8d4c353cfdaa442125dc4c (patch) | |
| tree | 3d631189e5913cc28418656721115588acf20b08 | |
| parent | 50017e89bfe2b7fc52687f1bb65f63a33cc88400 (diff) | |
soong: fix panic while lunching barbetr11.1
Assuming the kernel toolchain stuff will always remain inside /prebuilts
Fixes
13:20:21 runtime error: index out of range [1] with length 1
panic: runtime error: index out of range [1] with length 1 [recovered]
panic: runtime error: index out of range [1] with length 1
goroutine 1 [running]:
android/soong/ui/logger.(*stdLogger).Cleanup(0xc0001464e0)
build/soong/ui/logger/logger.go:214 +0x111
panic(0x7589a0, 0xc004e44580)
/home/siluxsept/Android/A11/prebuilts/go/linux-x86/src/runtime/panic.go:679 +0x1b2
android/soong/ui/build.Banner(0xc000146600, 0xc0000b2008, 0x7834b5)
build/soong/ui/build/dumpvars.go:187 +0x5e5
main.dumpVars(0xc0001442a0, 0xc00018c000, 0xc0000b4140, 0x4, 0x4, 0xc00014e298, 0x3)
build/soong/cmd/soong_ui/main.go:332 +0xd71
main.main()
build/soong/cmd/soong_ui/main.go:215 +0x1601
Change-Id: I58cf587a833465a7dd99603acd019371ac0f1580
| -rw-r--r-- | ui/build/dumpvars.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go index 9a1e710b7..8ac15ec1d 100644 --- a/ui/build/dumpvars.go +++ b/ui/build/dumpvars.go @@ -183,7 +183,7 @@ func Banner(make_vars map[string]string) string { fmt.Fprintf(b, "%s=%s\n", name, make_vars[name]) } if (make_vars[name] != "" && name == "KERNEL_TOOLCHAIN") { - parts := strings.Split(make_vars[name], "linux-x86/") + parts := strings.Split(make_vars[name], "prebuilts/") fmt.Fprintf(b, "%s=%s\n", name, parts[1]) } } |