From e4dd14b25fe65b2fc6a5a2fb51d3647f1d455890 Mon Sep 17 00:00:00 2001 From: Thiébaud Weksteen Date: Wed, 14 Apr 2021 11:18:47 +0200 Subject: bloaty: measure stripped Rust binaries Modify bloaty's MeasureSizeForPath to allow a module to provide multiple paths. This is used to measure both unstripped and stripped libraries/binaries. Add unit test to ensure correct measurements are generated for Rust. Test: m out/soong/binary_sizes.pb.gz Change-Id: I59439b77dbf1cf5ad71e1c02996a6a90938536b4 --- rust/rust.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rust/rust.go') diff --git a/rust/rust.go b/rust/rust.go index ca85d74cc..fb0be2a2a 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -22,6 +22,7 @@ import ( "github.com/google/blueprint/proptools" "android/soong/android" + "android/soong/bloaty" "android/soong/cc" cc_config "android/soong/cc/config" "android/soong/rust/config" @@ -731,8 +732,8 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { if mod.compiler != nil && !mod.compiler.Disabled() { mod.compiler.initialize(ctx) unstrippedOutputFile := mod.compiler.compile(ctx, flags, deps) - mod.unstrippedOutputFile = android.OptionalPathForPath(unstrippedOutputFile) + bloaty.MeasureSizeForPaths(ctx, mod.compiler.strippedOutputFilePath(), mod.unstrippedOutputFile) apexInfo := actx.Provider(android.ApexInfoProvider).(android.ApexInfo) if mod.installable(apexInfo) { -- cgit v1.2.3-59-g8ed1b