diff --git a/cc/makevars.go b/cc/makevars.go index 23814c3cb..b07297d64 100644 --- a/cc/makevars.go +++ b/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]