commit 98e7e66cb69eedb7968cf1d08a60fa520e4b3fb7
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 15 05:18:04 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 15 05:18:04 2016 +0000
tree 7891974cef9b8438ebf7791b8270dd4c524c2e77
parent 394e9dc8769faf4a02be409ec0f7c4f7b2c97ce5
parent 65905f8f623ddbe6d22e96b01e34f149f2b5e348

Merge "Sort NDK_MIGRATED_LIBS in make_vars"

cc/makevars.go

diff --git a/cc/makevars.go b/cc/makevars.go
index 23814c3..b07297d 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -17,6 +17,7 @@
 import (
 	"fmt"
 	"path/filepath"
+	"sort"
 	"strings"
 
 	"android/soong/android"
@@ -51,6 +52,7 @@
 	ctx.StrictRaw("SRC_HEADERS", strings.Join(includes, " "))
 	ctx.StrictRaw("SRC_SYSTEM_HEADERS", strings.Join(systemIncludes, " "))
 
+	sort.Strings(ndkMigratedLibs)
 	ctx.Strict("NDK_MIGRATED_LIBS", strings.Join(ndkMigratedLibs, " "))
 
 	hostTargets := ctx.Config().Targets[android.Host]