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

Commit 74bdc288 authored by Ryan Prichard's avatar Ryan Prichard
Browse files

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

This reverts commit 29b9de08.

Reason for revert: b/184095989

Change-Id: I11d90562e0703631258a5e9f1b2dc36f1702289a
parent 29b9de08

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))

	}