commit c511bc50dcaba95bf731bcc72ffbfab3805cacc6
author Colin Cross <ccross@android.com> Tue Apr 07 16:50:32 2020 +0000
committer Colin Cross <ccross@android.com> Tue Apr 07 16:50:32 2020 +0000
tree 66e6710d15bd5f3d8178863fd5fca9518a5462fd
parent f8e80229fedb47302e9cfd32990859a6308020cf

Revert^2 "Add sdk mutator for native modules"

f8e80229fedb47302e9cfd32990859a6308020cf

Change-Id: Ic30ab6b844684bfc3e8ece5a1913980d5fbf8de2

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index 346e7d8..5ce854e 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -1223,7 +1223,7 @@
 	if Bool(library.Properties.Static_ndk_lib) && library.static() &&
 		!ctx.useVndk() && !ctx.inRamdisk() && !ctx.inRecovery() && ctx.Device() &&
 		library.baseLinker.sanitize.isUnsanitizedVariant() &&
-		!library.buildStubs() {
+		!library.buildStubs() && ctx.sdkVersion() == "" {
 		installPath := getNdkSysrootBase(ctx).Join(
 			ctx, "usr/lib", config.NDKTriple(ctx.toolchain()), file.Base())