diff options
| author | 2022-01-27 21:39:18 +0000 | |
|---|---|---|
| committer | 2022-01-27 21:39:18 +0000 | |
| commit | 6bf833f4286a19dea4087ebe5abfc724e8a10be7 (patch) | |
| tree | 7b756f65a3aaa56ce473658b54f28dcb5cd1b3f5 /rust/builder.go | |
| parent | 1785fcb171071f97409aba4cde4fcfba39644ddb (diff) | |
| parent | e32f09312019d7dea38b058cbc23dd0ea1186cf8 (diff) | |
Merge changes from topic "musl_rust"
* changes:
Support building rust modules against musl libc
Support genrules as CrtBegin and CrtEnd in rust
Support multiple crtbegin and crtend dependencies
Diffstat (limited to 'rust/builder.go')
| -rw-r--r-- | rust/builder.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/rust/builder.go b/rust/builder.go index e66a6f071..00035b9b7 100644 --- a/rust/builder.go +++ b/rust/builder.go @@ -247,9 +247,8 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl implicits = append(implicits, deps.srcProviderFiles...) implicits = append(implicits, deps.AfdoProfiles...) - if deps.CrtBegin.Valid() { - implicits = append(implicits, deps.CrtBegin.Path(), deps.CrtEnd.Path()) - } + implicits = append(implicits, deps.CrtBegin...) + implicits = append(implicits, deps.CrtEnd...) if len(deps.SrcDeps) > 0 { moduleGenDir := ctx.RustModule().compiler.CargoOutDir() @@ -319,8 +318,8 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl "rustcFlags": strings.Join(rustcFlags, " "), "linkFlags": strings.Join(linkFlags, " "), "libFlags": strings.Join(libFlags, " "), - "crtBegin": deps.CrtBegin.String(), - "crtEnd": deps.CrtEnd.String(), + "crtBegin": strings.Join(deps.CrtBegin.Strings(), " "), + "crtEnd": strings.Join(deps.CrtEnd.Strings(), " "), "envVars": strings.Join(envVars, " "), }, }) |