rust: Only pass "-lstatic" for rlibs.

Passing '-lstatic' for dylib static dependencies results in some
unexpected bloat as the static libraries are included as
whole-archives.

For now, limit this to rlibs while we investigate.

Bug: 175886967
Bug: 179122837
Test: cd system/bt/; mma
Test: Checked size of dylibs.
Change-Id: Id8328e95771e2ca8503bc8df35248b1c39cabc8e
This commit is contained in:
Ivan Lozano
2021-02-05 12:27:08 -05:00
parent b3f9025b6e
commit fb6f36f3e4
2 changed files with 13 additions and 9 deletions

View File

@@ -213,6 +213,7 @@ func TestDepsTracking(t *testing.T) {
name: "librlib",
srcs: ["foo.rs"],
crate_name: "rlib",
static_libs: ["libstatic"],
}
rust_proc_macro {
name: "libpm",
@@ -230,7 +231,7 @@ func TestDepsTracking(t *testing.T) {
}
`)
module := ctx.ModuleForTests("fizz-buzz", "linux_glibc_x86_64").Module().(*Module)
rustc := ctx.ModuleForTests("fizz-buzz", "linux_glibc_x86_64").Rule("rustc")
rustc := ctx.ModuleForTests("librlib", "linux_glibc_x86_64_rlib_rlib-std").Rule("rustc")
// Since dependencies are added to AndroidMk* properties, we can check these to see if they've been picked up.
if !android.InList("libdylib", module.Properties.AndroidMkDylibs) {