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

Commit 4ba70ab4 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Skip default dependencies for header libraries"

parents ac9dc817 be763f7b

cc/linker.go

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { 


	if ctx.toolchain().Bionic() {

		// libclang_rt.builtins has to be last on the command line

		if !Bool(linker.Properties.No_libcrt) {

		if !Bool(linker.Properties.No_libcrt) && !ctx.header() {

			deps.LateStaticLibs = append(deps.LateStaticLibs, config.BuiltinsRuntimeLibrary(ctx.toolchain()))

		}

cc/stl.go

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ func (stl *stl) begin(ctx BaseModuleContext) { 
		s := ""

		if stl.Properties.Stl != nil {

			s = *stl.Properties.Stl

		} else if ctx.header() {

			s = "none"

		}

		if ctx.useSdk() && ctx.Device() {

			switch s {