diff options
| author | Jeffrey Vander Stoep <jeffv@google.com> | 2019-11-14 18:28:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-14 18:28:13 +0000 |
| commit | f3a2d5abc3b3106a73eb48dc865b5855cb33db42 (patch) | |
| tree | 894aa3eb10290a15346dd47e67f2be388a395e62 /rust/binary.go | |
| parent | 263dcb7397844bd6d4005b8aaffbb01120da85d0 (diff) | |
| parent | 51feafad57da137b3476de84e8e9fd8fd3732cb4 (diff) | |
Merge changes from topic "rust-sysroot"
* changes:
Enable x86_64 device support
Build Rust Device Sysroots in Soong
Diffstat (limited to 'rust/binary.go')
| -rw-r--r-- | rust/binary.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/rust/binary.go b/rust/binary.go index a909ea681..d4b661491 100644 --- a/rust/binary.go +++ b/rust/binary.go @@ -16,7 +16,6 @@ package rust import ( "android/soong/android" - "android/soong/rust/config" ) func init() { @@ -91,12 +90,6 @@ func (binary *binaryDecorator) compilerFlags(ctx ModuleContext, flags Flags) Fla func (binary *binaryDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps { deps = binary.baseCompiler.compilerDeps(ctx, deps) - if binary.preferDynamic() || len(deps.Dylibs) > 0 { - for _, stdlib := range config.Stdlibs { - deps.Dylibs = append(deps.Dylibs, stdlib+"_"+ctx.toolchain().RustTriple()) - } - } - if ctx.toolchain().Bionic() { deps = binary.baseCompiler.bionicDeps(ctx, deps) deps.CrtBegin = "crtbegin_dynamic" |