Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 443e6397 authored by Ivan Lozano's avatar Ivan Lozano Committed by Automerger Merge Worker
Browse files

Merge "rust: Fix exported MinSdkVersion" am: 2a1291d0 am: 5a7edb74 am: c826593e 

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

Change-Id: Ibff535beed4bac5a7845e3cacc300286dd7b34f0
parents b0b0e335 c826593e

rust/rust.go

+2 −8
Original line number Diff line number Diff line
@@ -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

	}