commit c9460bbff8aba7ab11e9678c3bcd63d8b0711656
author Dan Albert <danalbert@google.com> Wed Dec 20 15:51:30 2017 -0800
committer Dan Albert <danalbert@google.com> Fri Jan 05 10:59:33 2018 -0800
tree dbfd9fdc11210c583415e5b941dca0de820dbccc
parent 68a7023436c9b9c9c6fb3ab2e2cfb6a5e4f71612

Remove support for gnustl.

Test: make checkbuild
Bug: None
Change-Id: Ifa457e9907e20bafa2885fbd6935d43b7f22aaaf

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index 9bd12a9..d0a580c 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -579,7 +579,7 @@
 
 	// TODO(danalbert): Clean this up when soong supports prebuilts.
 	if strings.HasPrefix(ctx.selectedStl(), "ndk_libc++") {
-		libDir := getNdkStlLibDir(ctx, flags.Toolchain, "libc++")
+		libDir := getNdkStlLibDir(ctx, "libc++")
 
 		if strings.HasSuffix(ctx.selectedStl(), "_shared") {
 			deps.StaticLibs = append(deps.StaticLibs,