commit 281f22b3f296674e147acffd7083d4d11f73cf0d
author Dan Albert <danalbert@google.com> Wed Dec 13 15:03:47 2017 -0800
committer Dan Albert <danalbert@google.com> Thu Dec 14 14:13:56 2017 -0800
tree 1f394f663b0c3283f107c90c21afd6362cd48f6a
parent 1e306c172f508151e0944145d6921a5ef2aec6ed

Don't install host or VNDK libs to the NDK.

Test: set `static_ndk_lib: true` on compiler-rt-extras, make ndk,
    `find out/soong/ndk -name '*.a'`
Bug: None

Change-Id: I6e82d3628efb602963552d3a91ee6176e8f3d2ff

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index b664a5e..d53bcfc 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -733,7 +733,8 @@
 		library.baseInstaller.install(ctx, file)
 	}
 
-	if Bool(library.Properties.Static_ndk_lib) && library.static() {
+	if Bool(library.Properties.Static_ndk_lib) && library.static() &&
+		!ctx.useVndk() && ctx.Device() {
 		installPath := getNdkSysrootBase(ctx).Join(
 			ctx, "usr/lib", ctx.toolchain().ClangTriple(), file.Base())