Merge #376 by ted-xie: Fix local_config_platform errors

Fixes #374
Closes #376

COPYBARA_INTEGRATE_REVIEW=#376 from ted-xie:local_config_platform 425a408
PiperOrigin-RevId: 771199308
Change-Id: I816b0c33c3eca3133e39443d5eb89f5757ac827e

Author: ted-xie

.bazelci/presubmit.yml

@@ -3,7 +3,7 @@
 matrix:
   bazel: [
     7.4.1,
-    8.0.0rc7,
+    8.2.1,
     last_green,
   ]
 

.bazelrc

@@ -1 +1,6 @@
 common --java_runtime_version=17
+
+# Workaround for a rules_java + bazel < 8.3.0 issue. It should only be relevant
+# for bazel@HEAD and rolling releases.
+# https://github.com/bazelbuild/bazel/pull/26119
+common --repositories_without_autoloads=bazel_features_version,bazel_features_globals

MODULE.bazel

@@ -6,8 +6,8 @@ module(
 
 bazel_dep(name = "platforms", version = "0.0.5")
 bazel_dep(name = "rules_license", version = "1.0.0")
-bazel_dep(name = "rules_java", version = "8.6.3")
-bazel_dep(name = "rules_cc", version = "0.0.16")
+bazel_dep(name = "rules_java", version = "8.12.0")
+bazel_dep(name = "rules_cc", version = "0.1.1")
 bazel_dep(name = "rules_shell", version = "0.1.2")
 
 bazel_dep(name = "stardoc", version = "0.7.2", dev_dependency = True)

WORKSPACE

@@ -7,9 +7,11 @@ load("prereqs.bzl", "rules_android_prereqs")
 rules_android_prereqs(dev_mode = True)
 
 load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
-
 rules_java_dependencies()
 
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+bazel_features_deps()
+
 # note that the following line is what is minimally required from protobuf for the java rules
 # consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
 load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility

defs.bzl

@@ -13,7 +13,6 @@
 # limitations under the License.
 """Workspace setup macro for rules_android."""
 
-load("@bazel_features//:deps.bzl", "bazel_features_deps")
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
@@ -34,8 +33,6 @@ load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_
 def rules_android_workspace():
     """ Sets up workspace dependencies for rules_android."""
 
-    bazel_features_deps()
-
     protobuf_deps()
 
     bazel_skylib_workspace()

examples/basicapp/.bazelrc

@@ -5,3 +5,8 @@ common:core_library_desugaring --desugar_java8_libs
 mobile-install --mode=skylark --mobile_install_aspect=@rules_android//mobile_install:mi.bzl --mobile_install_supported_rules=android_binary
 # Required to invoke the Studio deployer jar
 common --tool_java_runtime_version=17
+
+# Workaround for a rules_java + bazel < 8.3.0 issue. It should only be relevant
+# for bazel@HEAD and rolling releases.
+# https://github.com/bazelbuild/bazel/pull/26119
+common --repositories_without_autoloads=bazel_features_version,bazel_features_globals

examples/basicapp/MODULE.bazel

@@ -2,7 +2,7 @@ module(
     name = "basicapp",
 )
 
-bazel_dep(name = "rules_java", version = "7.12.2")
+bazel_dep(name = "rules_java", version = "8.12.0")
 bazel_dep(name = "bazel_skylib", version = "1.3.0")
 
 bazel_dep(

examples/basicapp/WORKSPACE

@@ -12,6 +12,10 @@ rules_android_prereqs()
 ##### rules_java setup for rules_android #####
 load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
 rules_java_dependencies()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+bazel_features_deps()
+
 # note that the following line is what is minimally required from protobuf for the java rules
 # consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
 load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")  # buildifier: disable=bzl-visibility

prereqs.bzl

@@ -25,17 +25,17 @@ def rules_android_prereqs(dev_mode = False):
         http_archive,
         name = "rules_java",
         urls = [
-            "https://github.com/bazelbuild/rules_java/releases/download/8.6.3/rules_java-8.6.3.tar.gz",
+            "https://github.com/bazelbuild/rules_java/releases/download/8.12.0/rules_java-8.12.0.tar.gz",
         ],
-        sha256 = "6d8c6d5cd86fed031ee48424f238fa35f33abc9921fd97dd4ae1119a29fc807f",
+        sha256 = "1558508fc6c348d7f99477bd21681e5746936f15f0436b5f4233e30832a590f9",
     )
 
     maybe(
         http_archive,
         name = "rules_cc",
-        urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.16/rules_cc-0.0.16.tar.gz"],
-        sha256 = "bbf1ae2f83305b7053b11e4467d317a7ba3517a12cef608543c1b1c5bf48a4df",
-        strip_prefix = "rules_cc-0.0.16",
+        urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz"],
+        sha256 = "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42",
+        strip_prefix = "rules_cc-0.1.1",
     )
 
     maybe(
@@ -211,14 +211,6 @@ def rules_android_prereqs(dev_mode = False):
         ],
     )
 
-    # This is only needed for bazel 8.0.0rc4
-    http_archive(
-        name = "bazel_features",
-        sha256 = "af3d4fb1cf4f25942cb4a933b1ad93a0ea9fe9ee70c2af7f369fb72a67c266e5",
-        strip_prefix = "bazel_features-1.21.0",
-        url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.21.0/bazel_features-v1.21.0.tar.gz",
-    )
-
     _apksig_archive()
     _com_android_dex_archive()
 

rules/android_sdk_repository/helper.bzl

@@ -13,7 +13,7 @@
 # limitations under the License.
 """Helpers for the build file used in android_sdk_repository."""
 
-load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS")
+load("@platforms//host:constraints.bzl", "HOST_CONSTRAINTS")
 load("@rules_android//rules:rules.bzl", "android_sdk")
 load("@rules_java//java:defs.bzl", "java_binary", "java_import")
 load("@rules_shell//shell:sh_binary.bzl", "sh_binary")