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

Merge \"Add libc and libm to modules that use libc++_static\"

Browse Source 
am: 46748b775c

Change-Id: I968f18ee434bea547886baed22d757d9beb23209
This commit is contained in:
Colin Cross
2016-07-15 23:53:39 +00:00
committed by android-build-merger
parent c4b2eac907 46748b775c
commit ccc84d5ce3
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/module.go
View File

@@ -567,6 +567,7 @@ func (a *androidModuleContext) InstallFile(installPath OutputPath, srcPath Path,
func (a *androidModuleContext) InstallSymlink(installPath OutputPath, name string, srcPath OutputPath) OutputPath {
fullInstallPath := installPath.Join(a, name)
if a.Host() || !a.AConfig().SkipDeviceInstall() {
a.ModuleBuild(pctx, ModuleBuildParams{
Rule: Symlink,
Output: fullInstallPath,
@@ -579,6 +580,7 @@ func (a *androidModuleContext) InstallSymlink(installPath OutputPath, name strin
a.installFiles = append(a.installFiles, fullInstallPath)
a.checkbuildFiles = append(a.checkbuildFiles, srcPath)
}
return fullInstallPath
}

2
cc/stl.go
View File

@@ -102,7 +102,7 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps {
deps.StaticLibs = append(deps.StaticLibs, "libunwind_llvm")
}
if ctx.staticBinary() {
deps.StaticLibs = append(deps.StaticLibs, "libdl")
deps.StaticLibs = append(deps.StaticLibs, "libm", "libc", "libdl")
} else {
deps.SharedLibs = append(deps.SharedLibs, "libdl")
}