Merge "bp2build java_libraries depend on Android SDK" am: 1b8942d4c8 am: 75249f9ed9 am: 16efeb08ee

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1997330

Change-Id: I29ff13d5d2df7d0ab0a1cde9cb63fc6915e3373b

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))
 	}