commit 7d1eecf3cca5370ebee334ba1dda3bc678edbd7c
author Dan Albert <danalbert@google.com> Fri Jan 19 12:30:45 2018 -0800
committer Dan Albert <danalbert@google.com> Mon Jan 22 12:40:13 2018 -0800
tree 03d95a84565ff019f8b6b7a753ffae74464340aa
parent e021b0405d8c8fa2c43d091c5e189159c53eb844

Fix static_ndk_lib for sanitized libraries.

Test: build-ndk-prebuilts.sh with libc/libm included in the NDK
Bug: https://github.com/android-ndk/ndk/issues/272
Change-Id: Ic398f541036f6c16f7dc58b9af984c60ed948495

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index 0ed1848..9661f44 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -729,7 +729,8 @@
 	}
 
 	if Bool(library.Properties.Static_ndk_lib) && library.static() &&
-		!ctx.useVndk() && ctx.Device() {
+		!ctx.useVndk() && ctx.Device() &&
+		library.sanitize.isUnsanitizedVariant() {
 		installPath := getNdkSysrootBase(ctx).Join(
 			ctx, "usr/lib", ctx.toolchain().ClangTriple(), file.Base())