From 83705c88d77a6cb60e7623beaee8be5bf04f9d2d Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 14 Sep 2016 16:47:18 -0700 Subject: [PATCH] Use libcompiler-rt_extras with NDK builds. Soong change to match https://android-review.googlesource.com/#/c/274448/. Test: make checkbuild tests Bug: None Change-Id: Ibc3732ce5b4a43a9151dca39a53572d248f86c45 --- cc/linker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/linker.go b/cc/linker.go index df19de7a7..4ee38dcc7 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -108,7 +108,7 @@ func (linker *baseLinker) linkerDeps(ctx BaseModuleContext, deps Deps) Deps { deps.ReexportStaticLibHeaders = append(deps.ReexportStaticLibHeaders, linker.Properties.Export_static_lib_headers...) deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...) - if !ctx.sdk() && ctx.ModuleName() != "libcompiler_rt-extras" { + if ctx.ModuleName() != "libcompiler_rt-extras" { deps.LateStaticLibs = append(deps.LateStaticLibs, "libcompiler_rt-extras") }