tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Sort cfi static libs to make them consistent"

Browse source 
am: 5313911912

Change-Id: Ifa11246b0a9203ba785a4d4c6614d93cc23b8643
This commit is contained in:
Jeff Gaston 2017-11-29 20:10:05 +00:00 committed by android-build-merger
commit aa2476bd42
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cc/sanitize.go
View file

@ -17,6 +17,7 @@ package cc
import ( import (
"fmt" "fmt"
"io" "io"
"sort"
"strings" "strings"
"sync" "sync"
@ -649,5 +650,6 @@ func cfiStaticLibs(config android.Config) *[]string {
func cfiMakeVarsProvider(ctx android.MakeVarsContext) { func cfiMakeVarsProvider(ctx android.MakeVarsContext) {
cfiStaticLibs := cfiStaticLibs(ctx.Config()) cfiStaticLibs := cfiStaticLibs(ctx.Config())
sort.Strings(*cfiStaticLibs)
ctx.Strict("SOONG_CFI_STATIC_LIBRARIES", strings.Join(*cfiStaticLibs, " ")) ctx.Strict("SOONG_CFI_STATIC_LIBRARIES", strings.Join(*cfiStaticLibs, " "))
} }