StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for NDK r13. am: d015c4ac1b

Browse Source 
am: 585738ad21

Change-Id: I7f7d2dc7a0fc1fcb4b9b804bc86126427c481886
This commit is contained in:
Dan Albert
2016-08-11 16:56:10 +00:00
committed by android-build-merger
parent 85d275aea5 585738ad21
commit 1f243d67a3
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cc/library.go
View File

@@ -395,6 +395,25 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext,
sharedLibs := deps.SharedLibs
sharedLibs = append(sharedLibs, deps.LateSharedLibs...)
// TODO(danalbert): Clean this up when soong supports prebuilts.
if strings.HasPrefix(ctx.selectedStl(), "ndk_libc++") {
libDir := getNdkStlLibDir(ctx, flags.Toolchain, "libc++")
if strings.HasSuffix(ctx.selectedStl(), "_shared") {
deps.StaticLibs = append(deps.StaticLibs,
libDir.Join(ctx, "libandroid_support.a"))
} else {
deps.StaticLibs = append(deps.StaticLibs,
libDir.Join(ctx, "libc++abi.a"),
libDir.Join(ctx, "libandroid_support.a"))
}
if ctx.Arch().ArchType == android.Arm {
deps.StaticLibs = append(deps.StaticLibs,
libDir.Join(ctx, "libunwind.a"))
}
}
TransformObjToDynamicBinary(ctx, objFiles, sharedLibs,
deps.StaticLibs, deps.LateStaticLibs, deps.WholeStaticLibs,
linkerDeps, deps.CrtBegin, deps.CrtEnd, false, builderFlags, outputFile)