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

24
android/module.go
View File

@@ -567,18 +567,20 @@ func (a *androidModuleContext) InstallFile(installPath OutputPath, srcPath Path,
func (a *androidModuleContext) InstallSymlink(installPath OutputPath, name string, srcPath OutputPath) OutputPath { func (a *androidModuleContext) InstallSymlink(installPath OutputPath, name string, srcPath OutputPath) OutputPath {
fullInstallPath := installPath.Join(a, name) fullInstallPath := installPath.Join(a, name)
a.ModuleBuild(pctx, ModuleBuildParams{ if a.Host() || !a.AConfig().SkipDeviceInstall() {
Rule: Symlink, a.ModuleBuild(pctx, ModuleBuildParams{
Output: fullInstallPath, Rule: Symlink,
OrderOnly: Paths{srcPath}, Output: fullInstallPath,
Default: !a.AConfig().EmbeddedInMake(), OrderOnly: Paths{srcPath},
Args: map[string]string{ Default: !a.AConfig().EmbeddedInMake(),
"fromPath": srcPath.String(), Args: map[string]string{
}, "fromPath": srcPath.String(),
}) },
})
a.installFiles = append(a.installFiles, fullInstallPath) a.installFiles = append(a.installFiles, fullInstallPath)
a.checkbuildFiles = append(a.checkbuildFiles, srcPath) a.checkbuildFiles = append(a.checkbuildFiles, srcPath)
}
return fullInstallPath 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") deps.StaticLibs = append(deps.StaticLibs, "libunwind_llvm")
} }
if ctx.staticBinary() { if ctx.staticBinary() {
deps.StaticLibs = append(deps.StaticLibs, "libdl") deps.StaticLibs = append(deps.StaticLibs, "libm", "libc", "libdl")
} else { } else {
deps.SharedLibs = append(deps.SharedLibs, "libdl") deps.SharedLibs = append(deps.SharedLibs, "libdl")
} }