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

Merge "Keep vndk library lists sorted"

Browse Source
This commit is contained in:
Treehugger Robot
2017-08-18 00:10:16 +00:00
committed by Gerrit Code Review
parent 1115ddc838 766efbc9e9
commit ee41cb8116
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/vndk.go
View File

@@ -15,6 +15,7 @@
package cc package cc
import ( import (
"sort"
"strings" "strings"
"sync" "sync"
@@ -116,6 +117,7 @@ func vndkMutator(mctx android.BottomUpMutatorContext) {
name := strings.TrimSuffix(m.Name(), llndkLibrarySuffix) name := strings.TrimSuffix(m.Name(), llndkLibrarySuffix)
if !inList(name, llndkLibraries) { if !inList(name, llndkLibraries) {
llndkLibraries = append(llndkLibraries, name) llndkLibraries = append(llndkLibraries, name)
sort.Strings(llndkLibraries)
} }
} else if lib, ok := m.linker.(*libraryDecorator); ok && lib.shared() { } else if lib, ok := m.linker.(*libraryDecorator); ok && lib.shared() {
if m.vndkdep.isVndk() { if m.vndkdep.isVndk() {
@@ -124,10 +126,12 @@ func vndkMutator(mctx android.BottomUpMutatorContext) {
if m.vndkdep.isVndkSp() { if m.vndkdep.isVndkSp() {
if !inList(m.Name(), vndkSpLibraries) { if !inList(m.Name(), vndkSpLibraries) {
vndkSpLibraries = append(vndkSpLibraries, m.Name()) vndkSpLibraries = append(vndkSpLibraries, m.Name())
sort.Strings(vndkSpLibraries)
} }
} else { } else {
if !inList(m.Name(), vndkCoreLibraries) { if !inList(m.Name(), vndkCoreLibraries) {
vndkCoreLibraries = append(vndkCoreLibraries, m.Name()) vndkCoreLibraries = append(vndkCoreLibraries, m.Name())
sort.Strings(vndkCoreLibraries)
} }
} }
} }