Merge \"Add libc and libm to modules that use libc++_static\"
am: 46748b775c
Change-Id: I968f18ee434bea547886baed22d757d9beb23209
This commit is contained in:
@@ -567,18 +567,20 @@ func (a *androidModuleContext) InstallFile(installPath OutputPath, srcPath Path,
|
||||
func (a *androidModuleContext) InstallSymlink(installPath OutputPath, name string, srcPath OutputPath) OutputPath {
|
||||
fullInstallPath := installPath.Join(a, name)
|
||||
|
||||
a.ModuleBuild(pctx, ModuleBuildParams{
|
||||
Rule: Symlink,
|
||||
Output: fullInstallPath,
|
||||
OrderOnly: Paths{srcPath},
|
||||
Default: !a.AConfig().EmbeddedInMake(),
|
||||
Args: map[string]string{
|
||||
"fromPath": srcPath.String(),
|
||||
},
|
||||
})
|
||||
if a.Host() || !a.AConfig().SkipDeviceInstall() {
|
||||
a.ModuleBuild(pctx, ModuleBuildParams{
|
||||
Rule: Symlink,
|
||||
Output: fullInstallPath,
|
||||
OrderOnly: Paths{srcPath},
|
||||
Default: !a.AConfig().EmbeddedInMake(),
|
||||
Args: map[string]string{
|
||||
"fromPath": srcPath.String(),
|
||||
},
|
||||
})
|
||||
|
||||
a.installFiles = append(a.installFiles, fullInstallPath)
|
||||
a.checkbuildFiles = append(a.checkbuildFiles, srcPath)
|
||||
a.installFiles = append(a.installFiles, fullInstallPath)
|
||||
a.checkbuildFiles = append(a.checkbuildFiles, srcPath)
|
||||
}
|
||||
return fullInstallPath
|
||||
}
|
||||
|
||||
|
@@ -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")
|
||||
}
|
||||
|
Reference in New Issue
Block a user