StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sort cfi static libs to make them consistent" am: 5313911912

Browse Source 
am: aa2476bd42

Change-Id: I6bb091524f91cb80f9bc2ca206c6ceea5bd71cd0
This commit is contained in:
Jeff Gaston
2017-11-29 20:14:05 +00:00
committed by android-build-merger
parent 9ba1584a06 aa2476bd42
commit 62b9326663
1 changed files with 2 additions and 0 deletions
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, " "))
} }