diff options
| author | Sam Delmerico <delmerico@google.com> | 2022-02-23 15:18:56 +0000 |
|---|---|---|
| committer | Sam Delmerico <delmerico@google.com> | 2022-03-07 15:50:42 +0000 |
| commit | 881d72022af2b5b6f80148129ff078632baa46b5 (patch) | |
| tree | 59fdd20fb0be8ad593af8773ab4a3d5e9dd3fa91 /java/java.go | |
| parent | 10eada743abcfb1dc5d551dbda47195ad35cb00d (diff) | |
bp2build java_libraries depend on Android SDK
Soong adds an implicit dependency on the Android SDK for all
java_libraries (and related modules). This feature becomes apparent
after converting arch-variant srcs for android_apps, so we should suport
this for now. Eventually, we will want to replace this forced dependency
with a Bazel toolchain workaround.
Test: build/bazel/ci/bp2build.sh
Change-Id: Ic28e8c7690f69294b4bdcb9bb78a6f1f031fe97e
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)) } |