| commit | 53139119121242ed065eac3198ebc5fb4df3dbaf | [log] [tgz] |
|---|---|---|
| author | Jeff Gaston <jeffrygaston@google.com> | Wed Nov 29 19:58:38 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Nov 29 19:58:38 2017 +0000 |
| tree | a825944cfb84370862f00f7fdececc5616f64b0f | |
| parent | 8763169bdb202a0b8b2885742a6a4275576273cd [diff] | |
| parent | 7276539d6a42cf85c22bea06a64e24b7f9eb5e3e [diff] |
Merge "Sort cfi static libs to make them consistent"
diff --git a/cc/sanitize.go b/cc/sanitize.go index fcea4ef..bf58d0f 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go
@@ -17,6 +17,7 @@ import ( "fmt" "io" + "sort" "strings" "sync" @@ -649,5 +650,6 @@ func cfiMakeVarsProvider(ctx android.MakeVarsContext) { cfiStaticLibs := cfiStaticLibs(ctx.Config()) + sort.Strings(*cfiStaticLibs) ctx.Strict("SOONG_CFI_STATIC_LIBRARIES", strings.Join(*cfiStaticLibs, " ")) }