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

Commit ae424648 authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt""

parents 9d541397 74bdc288

cc/stl.go

+6 −1
Original line number Diff line number Diff line
@@ -188,7 +188,12 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps { 
		if needsLibAndroidSupport(ctx) {

			deps.StaticLibs = append(deps.StaticLibs, "ndk_libandroid_support")

		}

		// TODO: Switch the NDK over to the LLVM unwinder for non-arm32 architectures.

		if ctx.Arch().ArchType == android.Arm {

			deps.StaticLibs = append(deps.StaticLibs, "ndk_libunwind")

		} else {

			deps.StaticLibs = append(deps.StaticLibs, "libgcc_stripped")

		}

	default:

		panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl))

	}