Merge "Sort cfi static libs to make them consistent"
am: 5313911912
Change-Id: Ifa11246b0a9203ba785a4d4c6614d93cc23b8643
This commit is contained in:
commit
aa2476bd42
1 changed files with 2 additions and 0 deletions
|
@ -17,6 +17,7 @@ package cc
|
|||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
|
@ -649,5 +650,6 @@ func cfiStaticLibs(config android.Config) *[]string {
|
|||
|
||||
func cfiMakeVarsProvider(ctx android.MakeVarsContext) {
|
||||
cfiStaticLibs := cfiStaticLibs(ctx.Config())
|
||||
sort.Strings(*cfiStaticLibs)
|
||||
ctx.Strict("SOONG_CFI_STATIC_LIBRARIES", strings.Join(*cfiStaticLibs, " "))
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue