diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-20 07:36:10 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-20 07:36:10 +0000 |
commit | 264bcfbaf9fbf1349a820bf1608c813b3b102af3 (patch) | |
tree | efe69ed8e3c4598d269626a51d9be1d77b88733a | |
parent | b690d509c71cc09de5d478ad06d532a01bf636a1 (diff) | |
parent | 95ec1277c32db7247d82390ac9468f0ae1d14b90 (diff) | |
download | build_soong-264bcfbaf9fbf1349a820bf1608c813b3b102af3.tar.gz build_soong-264bcfbaf9fbf1349a820bf1608c813b3b102af3.tar.bz2 build_soong-264bcfbaf9fbf1349a820bf1608c813b3b102af3.zip |
release-request-369362fc-cc6c-4cb1-95c0-90b5ac7c52cb-for-git_oc-mr1-release-4288633 snap-temp-L81700000095141745
Change-Id: Ib562d273eef04aec0598b85cb37b307aa3ac83d9
-rw-r--r-- | cc/vndk.go | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -15,6 +15,7 @@ package cc import ( + "sort" "strings" "sync" @@ -116,6 +117,7 @@ func vndkMutator(mctx android.BottomUpMutatorContext) { name := strings.TrimSuffix(m.Name(), llndkLibrarySuffix) if !inList(name, llndkLibraries) { llndkLibraries = append(llndkLibraries, name) + sort.Strings(llndkLibraries) } } else if lib, ok := m.linker.(*libraryDecorator); ok && lib.shared() { if m.vndkdep.isVndk() { @@ -124,10 +126,12 @@ func vndkMutator(mctx android.BottomUpMutatorContext) { if m.vndkdep.isVndkSp() { if !inList(m.Name(), vndkSpLibraries) { vndkSpLibraries = append(vndkSpLibraries, m.Name()) + sort.Strings(vndkSpLibraries) } } else { if !inList(m.Name(), vndkCoreLibraries) { vndkCoreLibraries = append(vndkCoreLibraries, m.Name()) + sort.Strings(vndkCoreLibraries) } } } |