From 79f853d7b92d7ddafa276c574c2341fd6c20c8f2 Mon Sep 17 00:00:00 2001 From: Alix Date: Fri, 10 Feb 2023 15:57:01 +0000 Subject: temporary unblock for builds using sdkSystem Bug: 215230098 Change-Id: I521342c676f3362d3e1db0aab7924a04602525e1 Test: built captiveportal-lib and inspected BUILD file --- java/java.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'java/java.go') 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.") -- cgit v1.2.3