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

Merge "fix: comparison between min_sdk_version" am: 91913e3e07 am: bdafb79af7

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

Change-Id: Id481769c8852103cb3690911e44d103b0f9cbe6a
This commit is contained in:
Jooyung Han
2021-06-23 17:34:59 +00:00
committed by Automerger Merge Worker
parent b7a9ecd996 bdafb79af7
commit 73a471ea9b
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/base.go
View File

@@ -1513,12 +1513,8 @@ func (j *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext,
if sdkSpec.Kind == android.SdkCore {
return nil
}
ver, err := sdkSpec.EffectiveVersion(ctx)
if err != nil {
return err
}
if ver.GreaterThan(sdkVersion) {
return fmt.Errorf("newer SDK(%v)", ver)
if sdkSpec.ApiLevel.GreaterThan(sdkVersion) {
return fmt.Errorf("newer SDK(%v)", sdkSpec.ApiLevel)
}
return nil
}

8
java/java.go
View File

@@ -1416,12 +1416,8 @@ func (j *Import) ShouldSupportSdkVersion(ctx android.BaseModuleContext,
if sdkSpec.Kind == android.SdkCore {
return nil
}
ver, err := sdkSpec.EffectiveVersion(ctx)
if err != nil {
return err
}
if ver.GreaterThan(sdkVersion) {
return fmt.Errorf("newer SDK(%v)", ver)
if sdkSpec.ApiLevel.GreaterThan(sdkVersion) {
return fmt.Errorf("newer SDK(%v)", sdkSpec.ApiLevel)
}
return nil
}