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

Merge "Dedup NDK library lists in make." am: 8cf2fda4c4 am: f9d5977467

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353449

Change-Id: I778fb22183dd0d6e47a2acd270d4c6f0f8015774
This commit is contained in:
Treehugger Robot
2020-07-02 02:39:05 +00:00
committed by Automerger Merge Worker
parent 82fe912d84 f9d5977467
commit 2c3d9e54ea
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/makevars.go
View File

@@ -97,12 +97,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("CLANG_EXTERNAL_CFLAGS", "${config.ClangExternalCflags}")
ctx.Strict("GLOBAL_CLANG_CFLAGS_NO_OVERRIDE", "${config.NoOverrideClangGlobalCflags}")
ctx.Strict("GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE", "")
ndkLibNames := []string{}
for _, lib := range ndkKnownLibs {
ndkLibNames = append(ndkLibNames, strings.TrimPrefix(lib, "lib"))
}
sort.Strings(ndkLibNames)
ctx.Strict("NDK_PREBUILT_SHARED_LIBRARIES", strings.Join(ndkLibNames, " "))
ctx.Strict("BOARD_VNDK_VERSION", ctx.DeviceConfig().VndkVersion())
@@ -180,7 +174,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.StrictRaw("SRC_SYSTEM_HEADERS", strings.Join(systemIncludes, " "))
sort.Strings(ndkKnownLibs)
ctx.Strict("NDK_MIGRATED_LIBS", strings.Join(ndkKnownLibs, " "))
ctx.Strict("NDK_KNOWN_LIBS", strings.Join(ndkKnownLibs, " "))
hostTargets := ctx.Config().Targets[android.BuildOs]
makeVarsToolchain(ctx, "", hostTargets[0])