diff options
| author | Alix <agespino@google.com> | 2023-02-10 15:57:01 +0000 |
|---|---|---|
| committer | Alix <agespino@google.com> | 2023-02-21 17:01:16 +0000 |
| commit | 79f853d7b92d7ddafa276c574c2341fd6c20c8f2 (patch) | |
| tree | 9d3570f8f81d01f4277c526b6c3da4e55f03da8e /java/java.go | |
| parent | 789e532a047050177e9910c074a93b4c9e10720f (diff) | |
temporary unblock for builds using sdkSystem
Bug: 215230098
Change-Id: I521342c676f3362d3e1db0aab7924a04602525e1
Test: built captiveportal-lib and inspected BUILD file
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.") |