From 4a97cb432823899dfc70cd5a874409b353e08115 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 21 Apr 2016 15:53:42 -0700
Subject: [PATCH] Support "none" for stl when using ndk

Change-Id: I13ecf0a6be591814546a9a1c8b8356988348feb0
---
 cc/stl.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cc/stl.go b/cc/stl.go
index 23989d362..b84bb6acc 100644
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -46,6 +46,8 @@ func (stl *stl) begin(ctx BaseModuleContext) {
 				"stlport_shared", "stlport_static",
 				"gnustl_static":
 				return "ndk_lib" + stl.Properties.Stl
+			case "none":
+				return ""
 			default:
 				ctx.ModuleErrorf("stl: %q is not a supported STL with sdk_version set", stl.Properties.Stl)
 				return ""