Merge "Add libc++ and libc++_static aliases for SDK builds."

am: 29c69e83dd Change-Id: Icd8f61640a7ce5fd25ee06330ca1244af93f1a56
2017-01-26 21:34:21 +00:00
parent 0466bfff63 29c69e83dd
commit 4c51fe50e8
1 changed files with 4 additions and 0 deletions
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -50,6 +50,10 @@ func (stl *stl) begin(ctx BaseModuleContext) {
 				"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: