Keep vndk library lists sorted

soong_build was writing a different make_vars-*.mk on every run
because the lists of vndk libraries were not sorted, causing
kati to regenerate the ninja file.

Bug: 64013660
Test: m -j nothing && rm out/soong/build.ninja && m -j nothing
Merged-In: If1ef51bad602d61a337ee6f62d4758d4123cb00d
Change-Id: If1ef51bad602d61a337ee6f62d4758d4123cb00d
(cherry picked from commit 766efbc9e9cdb956f5cac63ddf9bf949f9c1a326)

1 files changed, 4 insertions, 0 deletions

diff --git a/cc/vndk.go b/cc/vndk.go
index 2e6ac137..395069b2 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -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)
 					}
 				}
 			}