commit 6bcee9abff86b01f4db892398ede1158b74a7f28
author android-build-prod (mdb) <android-build-team-robot@google.com> Thu Apr 26 00:51:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 26 00:51:07 2018 +0000
tree 0f5421886750f2fb29b240ca003188c760e2093e
parent eedc9484abe30787c9c96b3a300f4f288fc62a43
parent ea4b7b9cedde900b2f20ded34ed1f2fabe78e35d

Merge "Fix incomplete LTO bug workaround."

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index 00dc86b..4a7884b 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -21,6 +21,7 @@
 	"github.com/google/blueprint/pathtools"
 
 	"android/soong/android"
+	"android/soong/cc/config"
 )
 
 type LibraryProperties struct {
@@ -747,7 +748,7 @@
 		!ctx.useVndk() && ctx.Device() &&
 		library.sanitize.isUnsanitizedVariant() {
 		installPath := getNdkSysrootBase(ctx).Join(
-			ctx, "usr/lib", ctx.toolchain().ClangTriple(), file.Base())
+			ctx, "usr/lib", config.NDKTriple(ctx.toolchain()), file.Base())
 
 		ctx.ModuleBuild(pctx, android.ModuleBuildParams{
 			Rule:        android.Cp,