diff options
| author | Alix Espino <agespino@google.com> | 2023-02-23 20:47:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-02-23 20:47:37 +0000 |
| commit | 8393a0fcdc936afaad496447c782d0f292d3eeb5 (patch) | |
| tree | 889c5cca9aa6c45b8ee294ef33cb3888f99bde39 /java/java.go | |
| parent | d3ffe6475e31e48d9d1886f6ecb1d4f8e08d2503 (diff) | |
| parent | 79f853d7b92d7ddafa276c574c2341fd6c20c8f2 (diff) | |
Merge "temporary unblock for builds using sdkSystem"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index c2fcccf2f..89bd2ebe6 100644 --- a/java/java.go +++ b/java/java.go @@ -2807,6 +2807,9 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { if sdkVersion.Kind == android.SdkPublic && sdkVersion.ApiLevel == android.FutureApiLevel { // TODO(b/220869005) remove forced dependency on current public android.jar deps.Add(bazel.MakeLabelAttribute("//prebuilts/sdk:public_current_android_sdk_java_import")) + } else if sdkVersion.Kind == android.SdkSystem && sdkVersion.ApiLevel == android.FutureApiLevel { + // TODO(b/215230098) remove forced dependency on current public android.jar + deps.Add(bazel.MakeLabelAttribute("//prebuilts/sdk:system_current_android_sdk_java_import")) } } else if !deps.IsEmpty() { ctx.ModuleErrorf("Module has direct dependencies but no sources. Bazel will not allow this.") |