diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-04-26 00:51:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-26 00:51:07 +0000 |
| commit | 6bcee9abff86b01f4db892398ede1158b74a7f28 (patch) | |
| tree | 0f5421886750f2fb29b240ca003188c760e2093e | |
| parent | eedc9484abe30787c9c96b3a300f4f288fc62a43 (diff) | |
| parent | ea4b7b9cedde900b2f20ded34ed1f2fabe78e35d (diff) | |
| download | build_soong-6bcee9abff86b01f4db892398ede1158b74a7f28.tar.gz build_soong-6bcee9abff86b01f4db892398ede1158b74a7f28.tar.bz2 build_soong-6bcee9abff86b01f4db892398ede1158b74a7f28.zip | |
Merge "Fix incomplete LTO bug workaround."
| -rw-r--r-- | cc/library.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/library.go b/cc/library.go index 00dc86b5..4a7884b7 100644 --- a/cc/library.go +++ b/cc/library.go @@ -21,6 +21,7 @@ import ( "github.com/google/blueprint/pathtools" "android/soong/android" + "android/soong/cc/config" ) type LibraryProperties struct { @@ -747,7 +748,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) { !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, |