Merge "Sort NDK_MIGRATED_LIBS in make_vars" am: 98e7e66cb6

am: 565fc67ac9

Change-Id: Iccbc5465eadc12ed938b5cdade164aa769dbc7b8

cc/makevars.go

@@ -17,6 +17,7 @@ package cc
 import (
 	"fmt"
 	"path/filepath"
+	"sort"
 	"strings"
 
 	"android/soong/android"
@@ -51,6 +52,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
 	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]