Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cf2fda4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Dedup NDK library lists in make."

parents 2e93eb70 f164a946

cc/makevars.go

+1 −7
Original line number Diff line number Diff line
@@ -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])