Add android_gmaven_r8 to bazel's WORKSPACE file so that it overrides the version of R8 that might come from android_remote_tools.WORKSPACE in a released version of bazel used to run the test (which would be potentially out of date with respect to the source code). Also merge this with android_gmaven_r8_for_testing since they would be redundant.

RELNOTES: None.
PiperOrigin-RevId: 529830525
Change-Id: Ic5c18ce5beb7fb915b084dc19590a05b04675548

Author: ahumesky

WORKSPACE

@@ -1,7 +1,7 @@
 workspace(name = "io_bazel")
 
-load("//tools/build_defs/repo:http.bzl", "http_archive", "http_jar")
-load("//:distdir.bzl", "dist_http_archive", "distdir_tar")
+load("//tools/build_defs/repo:http.bzl", "http_archive")
+load("//:distdir.bzl", "dist_http_archive", "distdir_tar", "dist_http_jar")
 load("//:distdir_deps.bzl", "DIST_DEPS")
 load("//:repositories.bzl", "embedded_jdk_repositories")
 
@@ -262,21 +262,16 @@ distdir_tar(
     name = "test_WORKSPACE_files",
     archives = [
         "android_tools_pkg-0.28.0.tar",
-        "r8-8.0.40.jar",
     ],
     dirname = "test_WORKSPACE/distdir",
     dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "test_WORKSPACE_files" in attrs["used_in"]},
     sha256 = {
         "android_tools_pkg-0.28.0.tar": "db3b02421ae974e0b33573f3e4f658d5f89cc9a0b42baae0ba2ac08e25c0720a",
-        "r8-8.0.40.jar": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
     },
     urls = {
         "android_tools_pkg-0.28.0.tar": [
             "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.28.0.tar",
         ],
-        "r8-8.0.40.jar": [
-            "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
-        ],
     },
 )
 
@@ -298,12 +293,13 @@ http_archive(
     url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.28.0.tar",
 )
 
-# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
-# and tools/android/android_extensions.bzl
-http_jar(
-    name = "android_gmaven_r8_for_testing",
-    sha256 = "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
-    url = "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
+# This is here to override the android_gmaven_r8 rule from
+# src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
+# so that tests like src/test/java/com/google/devtools/build/android/r8:AllTests
+# use the most recent version of R8 rather than the one might be referenced in a released
+# version of bazel that might have an outdated android_remote_tools.WORKSPACE relative to the tests.
+dist_http_jar(
+    name = "android_gmaven_r8",
 )
 
 dist_http_archive(

distdir.bzl

@@ -14,7 +14,7 @@
 """Defines a repository rule that generates an archive consisting of the specified files to fetch"""
 
 load("//:distdir_deps.bzl", "DEPS_BY_NAME")
-load("//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
+load("//tools/build_defs/repo:http.bzl", "http_archive", "http_file", "http_jar")
 
 _BUILD = """
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
@@ -115,3 +115,21 @@ def dist_http_file(name, **kwargs):
         urls = info["urls"],
         **kwargs
     )
+
+def dist_http_jar(name, **kwargs):
+    """Wraps http_jar, providing attributes like sha and urls from the central list.
+
+    dist_http_jar wraps an http_jar invocation, but looks up relevant attributes
+    from distdir_deps.bzl so the user does not have to specify them.
+
+    Args:
+      name: repo name
+      **kwargs: see http_jar for allowed args.
+    """
+    info = DEPS_BY_NAME[name]
+    http_jar(
+        name = name,
+        sha256 = info["sha256"],
+        urls = info["urls"],
+        **kwargs
+    )

distdir_deps.bzl

@@ -288,6 +288,17 @@ DIST_DEPS = {
     # Build time dependencies for testing and packaging
     #
     ###################################################
+    "android_gmaven_r8": {
+        "archive": "r8-8.0.40.jar",
+        "sha256": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
+        "urls": [
+            "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
+        ],
+        "used_in": [
+            "test_WORKSPACE_files",
+        ],
+        "package_version": "8.0.40",
+    },
     "bazel_skylib": {
         "archive": "bazel-skylib-1.3.0.tar.gz",
         "sha256": "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506",

src/BUILD

@@ -559,7 +559,7 @@ release_archive(
 filegroup(
     name = "test_repos",
     srcs = [
-        "@android_gmaven_r8_for_testing//jar:file",
+        "@android_gmaven_r8//jar:file",
         "@android_tools_for_testing//:WORKSPACE",
         "@bazel_skylib//:WORKSPACE",
         "@com_google_protobuf//:WORKSPACE",

src/test/shell/testenv.sh.tmpl

@@ -272,7 +272,7 @@ EOF
 
     repos=(
         "android_tools_for_testing"
-        "android_gmaven_r8_for_testing"
+        "android_gmaven_r8"
         "bazel_skylib"
         "bazel_toolchains"
         "com_google_protobuf"