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

rust: Fix exported MinSdkVersion

Browse Source 
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
This commit is contained in:
Ivan Lozano
2022-01-11 12:02:06 -05:00
parent 865d5e6c9d
commit a91ba25464
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rust/rust.go
View File

@@ -366,10 +366,6 @@ func (mod *Module) SdkVersion() string {
return "" return ""
} }
func (mod *Module) MinSdkVersion() string {
return ""
}
func (mod *Module) AlwaysSdk() bool { func (mod *Module) AlwaysSdk() bool {
return false return false
} }
@@ -1497,15 +1493,13 @@ func (mod *Module) HostToolPath() android.OptionalPath {
var _ android.ApexModule = (*Module)(nil) var _ android.ApexModule = (*Module)(nil)
func (mod *Module) minSdkVersion() string { func (mod *Module) MinSdkVersion() string {
return String(mod.Properties.Min_sdk_version) return String(mod.Properties.Min_sdk_version)
} }
var _ android.ApexModule = (*Module)(nil)
// Implements android.ApexModule // Implements android.ApexModule
func (mod *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext, sdkVersion android.ApiLevel) error { func (mod *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext, sdkVersion android.ApiLevel) error {
minSdkVersion := mod.minSdkVersion() minSdkVersion := mod.MinSdkVersion()
if minSdkVersion == "apex_inherit" { if minSdkVersion == "apex_inherit" {
return nil return nil
} }