Merge "Add libc++ and libc++_static aliases for SDK builds."
diff --git a/cc/stl.go b/cc/stl.go
index 0ffeb03..43776f7 100644
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -50,6 +50,10 @@
 				"stlport_shared", "stlport_static",
 				"gnustl_static":
 				return "ndk_lib" + s
+			case "libc++":
+				return "ndk_libc++_shared"
+			case "libc++_static":
+				return "ndk_libc++_static"
 			case "none":
 				return ""
 			default: