diff options
| author | 2022-03-07 20:28:27 +0000 | |
|---|---|---|
| committer | 2022-03-07 20:28:27 +0000 | |
| commit | 75249f9ed9f7e4371096a1592f9a7430e1bca9f1 (patch) | |
| tree | 27199f7de86221075a4ebe1a45dcf63a93497bbf /java/java.go | |
| parent | 9b3a875efd764bb2ed54c9ec0b92524688434cb9 (diff) | |
| parent | 1b8942d4c86481406a0893129e41245b17ffd89d (diff) | |
Merge "bp2build java_libraries depend on Android SDK" am: 1b8942d4c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1997330
Change-Id: I551efbaf5830d6e862aa48888b1232bffc3757c9
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index d0f0abc7a..0a35908dd 100644 --- a/java/java.go +++ b/java/java.go @@ -2030,6 +2030,11 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) } var deps bazel.LabelList + sdkVersion := m.SdkVersion(ctx) + if sdkVersion.Kind == android.SdkPublic && sdkVersion.ApiLevel == android.FutureApiLevel { + // TODO(b/220869005) remove forced dependency on current public android.jar + deps.Add(&bazel.Label{Label: "//prebuilts/sdk:public_current_android_sdk_java_import"}) + } if m.properties.Libs != nil { deps.Append(android.BazelLabelForModuleDeps(ctx, m.properties.Libs)) } |