From a91ba25464da601edec703d6e22ce9743e6d6604 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Tue, 11 Jan 2022 12:02:06 -0500 Subject: [PATCH] rust: Fix exported MinSdkVersion The exported rust.MinSdkVersion always returns an empty string. Instead it should return the Min_sdk_version property like rust.minSdkVersion. This CL renames minSdkVersion to MinSdkVersion so the exported function has the correct behavior. Bug: 211858959 Test: m Change-Id: I4fecfba711c0d3d7a22f4fdf7684924a9457b464 Merged-In: I4fecfba711c0d3d7a22f4fdf7684924a9457b464 --- rust/rust.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/rust/rust.go b/rust/rust.go index 778000dd5..cba92c33f 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -366,10 +366,6 @@ func (mod *Module) SdkVersion() string { return "" } -func (mod *Module) MinSdkVersion() string { - return "" -} - func (mod *Module) AlwaysSdk() bool { return false } @@ -1497,15 +1493,13 @@ func (mod *Module) HostToolPath() android.OptionalPath { var _ android.ApexModule = (*Module)(nil) -func (mod *Module) minSdkVersion() string { +func (mod *Module) MinSdkVersion() string { return String(mod.Properties.Min_sdk_version) } -var _ android.ApexModule = (*Module)(nil) - // Implements android.ApexModule func (mod *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext, sdkVersion android.ApiLevel) error { - minSdkVersion := mod.minSdkVersion() + minSdkVersion := mod.MinSdkVersion() if minSdkVersion == "apex_inherit" { return nil }