Automated Code Change

PiperOrigin-RevId: 871745600
Change-Id: I15401ea89ed186edc7e0778851c4f9a4b9b370a6

Author: cushon

rules/android_binary/impl.bzl

@@ -15,6 +15,7 @@
 
 load("//providers:providers.bzl", "AndroidDexInfo", "AndroidFeatureFlagSet", "AndroidIdlInfo", "AndroidInstrumentationInfo", "AndroidLibraryResourceClassJarProvider", "AndroidOptimizationInfo", "AndroidPreDexJarInfo", "ApkInfo", "BaselineProfileProvider", "DataBindingV2Info", "ProguardMappingInfo", "StarlarkAndroidDexInfo", "StarlarkAndroidResourcesInfo", "StarlarkApkInfo")
 load("//rules:acls.bzl", "acls")
+load("//rules:add_constraints.bzl", "add_constraints")
 load("//rules:apk_packaging.bzl", _apk_packaging = "apk_packaging")
 load("//rules:baseline_profiles.bzl", _baseline_profiles = "baseline_profiles")
 load("//rules:common.bzl", "common")
@@ -231,11 +232,7 @@ def _process_jvm(ctx, db_ctx, packaged_resources_ctx, proto_ctx, stamp_ctx, **_u
         strict_deps = "DEFAULT",
         java_toolchain = common.get_java_toolchain(ctx),
     )
-    if getattr(java_common, "add_constraints", None):
-        java_info = java_common.add_constraints(
-            java_info,
-            constraints = ["android"],
-        )
+    java_info = add_constraints(java_info, constraints = ["android"])
 
     java_infos = [packaged_resources_ctx.r_java]
     if proto_ctx.java_info:

rules/android_local_test/impl.bzl

@@ -14,6 +14,7 @@
 """Bazel rule for Android local test."""
 
 load("//providers:providers.bzl", "AndroidFilteredJdepsInfo")
+load("//rules:add_constraints.bzl", "add_constraints")
 load("//rules:attrs.bzl", "attrs")
 load("//rules:common.bzl", "common")
 load("//rules:java.bzl", "java")
@@ -160,11 +161,7 @@ def _process_jvm(ctx, resources_ctx, **_unused_sub_ctxs):
         plugins = utils.collect_providers(JavaPluginInfo, ctx.attr.plugins),
         java_toolchain = common.get_java_toolchain(ctx),
     )
-    if getattr(java_common, "add_constraints", None):
-        java_info = java_common.add_constraints(
-            java_info,
-            constraints = ["android"],
-        )
+    java_info = add_constraints(java_info, constraints = ["android"])
 
     # TODO(timpeut): some conformance tests require a filtered JavaInfo
     # with no transitive_ deps.

rules/resources.bzl

@@ -15,9 +15,9 @@
 
 load("//providers:providers.bzl", "AndroidLibraryResourceClassJarProvider", "ResourcesNodeInfo", "StarlarkAndroidResourcesInfo")
 load("//rules:acls.bzl", "acls")
+load("//rules:add_constraints.bzl", "add_constraints")
 load("//rules:min_sdk_version.bzl", _min_sdk_version = "min_sdk_version")
 load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
-load("@rules_java//java/common:java_common.bzl", "java_common")
 load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load(":attrs.bzl", _attrs = "attrs")
@@ -839,6 +839,8 @@ def _package(
         source_jar = r_java,
     )
 
+    java_info = add_constraints(java_info, constraints = ["android"])
+
     packaged_resources_ctx[_R_JAVA] = java_info
     packaged_resources_ctx[_DATA_BINDING_LAYOUT_INFO] = data_binding_layout_info
 
@@ -1607,6 +1609,8 @@ def _process_starlark(
 
         packages_to_r_txts_depset.setdefault(java_package, []).append(depset([out_aapt2_r_txt]))
 
+        java_info = add_constraints(java_info, constraints = ["android"])
+
         resources_ctx[_R_JAVA] = java_info
         resources_ctx[_DATA_BINDING_LAYOUT_INFO] = data_binding_layout_info