StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sort NDK_MIGRATED_LIBS in make_vars" am: 98e7e66cb6

Browse Source 
am: 565fc67ac9

Change-Id: Iccbc5465eadc12ed938b5cdade164aa769dbc7b8
This commit is contained in:
Dan Willemsen
2016-09-15 05:25:58 +00:00
committed by android-build-merger
parent 356bf7eb6d 565fc67ac9
commit 6bfb956885
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/makevars.go
View File

@@ -17,6 +17,7 @@ package cc
import ( import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"sort"
"strings" "strings"
"android/soong/android" "android/soong/android"
@@ -51,6 +52,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.StrictRaw("SRC_HEADERS", strings.Join(includes, " ")) ctx.StrictRaw("SRC_HEADERS", strings.Join(includes, " "))
ctx.StrictRaw("SRC_SYSTEM_HEADERS", strings.Join(systemIncludes, " ")) ctx.StrictRaw("SRC_SYSTEM_HEADERS", strings.Join(systemIncludes, " "))
sort.Strings(ndkMigratedLibs)
ctx.Strict("NDK_MIGRATED_LIBS", strings.Join(ndkMigratedLibs, " ")) ctx.Strict("NDK_MIGRATED_LIBS", strings.Join(ndkMigratedLibs, " "))
hostTargets := ctx.Config().Targets[android.Host] hostTargets := ctx.Config().Targets[android.Host]