diff options
| author | 2024-05-20 17:38:11 +0000 | |
|---|---|---|
| committer | 2024-05-20 17:38:11 +0000 | |
| commit | 82981345039eebcfa8c071b875bad445f9de04e3 (patch) | |
| tree | 2fa1b1cfaba027f088a0d9802a7541e33d1ef631 /java/java.go | |
| parent | 9b9d29b8458a63a54f9e79f888a5e6060e284f3f (diff) | |
| parent | 50801e20a32164731a3d5ebb4edbe3d4c01f6381 (diff) | |
Merge changes Ifbe123d1,Ie2e738a6 into main
* changes:
Support min_sdk_version overrides in apexes
Support min_sdk_version overrides in apps
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 0df96a3a5..f038f634b 100644 --- a/java/java.go +++ b/java/java.go @@ -908,7 +908,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { // Check min_sdk_version of the transitive dependencies if this module is created from // java_sdk_library. - if j.deviceProperties.Min_sdk_version != nil && j.SdkLibraryName() != nil { + if j.overridableProperties.Min_sdk_version != nil && j.SdkLibraryName() != nil { j.CheckDepsMinSdkVersion(ctx) } @@ -1096,7 +1096,7 @@ func (p *librarySdkMemberProperties) PopulateFromVariant(ctx android.SdkMemberCo // If the min_sdk_version was set then add the canonical representation of the API level to the // snapshot. - if j.deviceProperties.Min_sdk_version != nil { + if j.overridableProperties.Min_sdk_version != nil { canonical, err := android.ReplaceFinalizedCodenames(ctx.SdkModuleContext().Config(), j.minSdkVersion.String()) if err != nil { ctx.ModuleErrorf("%s", err) |