diff options
Diffstat (limited to 'build/makevars.go')
| -rw-r--r-- | build/makevars.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/makevars.go b/build/makevars.go index 1965b5d26f..cc8b9cd84c 100644 --- a/build/makevars.go +++ b/build/makevars.go @@ -34,7 +34,7 @@ var ( "bin/llvm-addr2line", "bin/llvm-dwarfdump", "bin/llvm-objdump", - "lib64/libc++.so.1", + "lib/libc++.so.1", } ) @@ -62,7 +62,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) { // Create list of copy commands to install the content of the testcases directory. testcasesContent := testcasesContent(ctx.Config()) copy_cmds := []string{} - for _, key := range android.SortedStringKeys(testcasesContent) { + for _, key := range android.SortedKeys(testcasesContent) { copy_cmds = append(copy_cmds, testcasesContent[key]+":"+key) } ctx.Strict("ART_TESTCASES_CONTENT", strings.Join(copy_cmds, " ")) |