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

Commit a5d1fab1 authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Remove libc_scudo references."

parents ce3912fd f70926ee

apex/apex.go

+0 −1
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ func makeApexAvailableBaseline() map[string][]string { 
		"libbinderthreadstateutils",

		"libbluetooth-types-header",

		"libbufferhub_headers",

		"libc_scudo",

		"libcodec2",

		"libcodec2_headers",

		"libcodec2_hidl@1.0",

cc/linker.go

+0 −11
Original line number Diff line number Diff line
@@ -298,17 +298,6 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { 
			}

		}



		if inList("libc_scudo", deps.SharedLibs) {

			// libc_scudo is an alternate implementation of all

			// allocation functions (malloc, free), that uses

			// the scudo allocator instead of the default native

			// allocator. If this library is in the list, make

			// sure it's first so it properly overrides the

			// allocation functions of all other shared libraries.

			_, deps.SharedLibs = removeFromList("libc_scudo", deps.SharedLibs)

			deps.SharedLibs = append([]string{"libc_scudo"}, deps.SharedLibs...)

		}



		// If libc and libdl are both in system_shared_libs make sure libdl comes after libc

		// to avoid loading libdl before libc.

		if inList("libdl", systemSharedLibs) && inList("libc", systemSharedLibs) &&

cc/sanitize.go

+0 −10
Original line number Diff line number Diff line
@@ -408,16 +408,6 @@ func (sanitize *sanitize) deps(ctx BaseModuleContext, deps Deps) Deps { 
		return deps

	}



	if ctx.Device() {

		if Bool(sanitize.Properties.Sanitize.Address) {

			// Compiling asan and having libc_scudo in the same

			// executable will cause the executable to crash.

			// Remove libc_scudo since it is only used to override

			// allocation functions which asan already overrides.

			_, deps.SharedLibs = removeFromList("libc_scudo", deps.SharedLibs)

		}

	}



	return deps

}