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

Merge "rust: Fix exported MinSdkVersion" am: 2a1291d01d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944330

Change-Id: I211d113528d2df7d3557cb5815e86a631f6ce733
This commit is contained in:
Ivan Lozano
2022-01-14 23:00:57 +00:00
committed by Automerger Merge Worker
parent b14c2bf5d9 2a1291d01d
commit 5a7edb74d1
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
} }