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

Merge changes I828b3e6b,I5d85ea8b

Browse Source 
am: 5f5809a098

Change-Id: I9404095b752929514297e8a6f31666e4055ada2d
This commit is contained in:
Matthew Maurer
2020-01-15 12:30:59 -08:00
committed by android-build-merger
parent 7e3950624e 5f5809a098
commit 046fda828c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rust/library.go
View File

@@ -323,6 +323,7 @@ func (library *libraryDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {
return deps return deps
} }
func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags) Flags { func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags) Flags {
flags.RustFlags = append(flags.RustFlags, "-C metadata="+ctx.baseModuleName())
flags = library.baseCompiler.compilerFlags(ctx, flags) flags = library.baseCompiler.compilerFlags(ctx, flags)
if library.shared() || library.static() { if library.shared() || library.static() {
library.includeDirs = append(library.includeDirs, android.PathsForModuleSrc(ctx, library.Properties.Include_dirs)...) library.includeDirs = append(library.includeDirs, android.PathsForModuleSrc(ctx, library.Properties.Include_dirs)...)
@@ -337,7 +338,7 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa
flags.RustFlags = append(flags.RustFlags, deps.depFlags...) flags.RustFlags = append(flags.RustFlags, deps.depFlags...)
if library.dylib() || library.shared() { if library.dylib() {
// We need prefer-dynamic for now to avoid linking in the static stdlib. See: // We need prefer-dynamic for now to avoid linking in the static stdlib. See:
// https://github.com/rust-lang/rust/issues/19680 // https://github.com/rust-lang/rust/issues/19680
// https://github.com/rust-lang/rust/issues/34909 // https://github.com/rust-lang/rust/issues/34909