diff options
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/java/base.go b/java/base.go index 730554896..21ad73f84 100644 --- a/java/base.go +++ b/java/base.go @@ -2267,20 +2267,16 @@ func (m JavaDepInSameApexChecker) OutgoingDepIsInSameApex(tag blueprint.Dependen } // Implements android.ApexModule -func (j *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext, sdkVersion android.ApiLevel) error { +func (j *Module) MinSdkVersionSupported(ctx android.BaseModuleContext) android.ApiLevel { sdkVersionSpec := j.SdkVersion(ctx) minSdkVersion := j.MinSdkVersion(ctx) - if !minSdkVersion.Specified() { - return fmt.Errorf("min_sdk_version is not specified") - } + // If the module is compiling against core (via sdk_version), skip comparison check. if sdkVersionSpec.Kind == android.SdkCore { - return nil + return android.MinApiLevel } - if minSdkVersion.GreaterThan(sdkVersion) { - return fmt.Errorf("newer SDK(%v)", minSdkVersion) - } - return nil + + return minSdkVersion } func (j *Module) Stem() string { |