StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support "none" for stl when using ndk am: 4a97cb4

Browse Source 
am: 4bd2663

* commit '4bd26639378a2cf7c1480823b63645ee7d40c584':
  Support "none" for stl when using ndk

Change-Id: I897148eb79025daa6485fd45c5946d4a889bb88e
This commit is contained in:
Colin Cross
2016-04-25 21:32:06 +00:00
committed by android-build-merger
parent 0ba6f91be9 4bd2663937
commit 9a6f1723ae
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/stl.go
View File

@@ -46,6 +46,8 @@ func (stl *stl) begin(ctx BaseModuleContext) {
"stlport_shared", "stlport_static", "stlport_shared", "stlport_static",
"gnustl_static": "gnustl_static":
return "ndk_lib" + stl.Properties.Stl return "ndk_lib" + stl.Properties.Stl
case "none":
return ""
default: default:
ctx.ModuleErrorf("stl: %q is not a supported STL with sdk_version set", stl.Properties.Stl) ctx.ModuleErrorf("stl: %q is not a supported STL with sdk_version set", stl.Properties.Stl)
return "" return ""