Merge "Dedup NDK library lists in make." am: 8cf2fda4c4 am: f9d5977467 am: 2c3d9e54ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353449
Change-Id: Ied84803b530f806af5f9d7857bb70a0c88f01d02
diff --git a/cc/makevars.go b/cc/makevars.go
index 4cb414e..968eeb5 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -97,12 +97,6 @@
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 @@
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])