fix properties file's path in android_local_test

bazelbuild · Feb 1, 2024 · 5abd169 · 5abd169
1 parent 1af51cc
commit 5abd169
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -100,3 +100,13 @@ use_repo(bazel_binaries, "bazel_binaries")
 # extension for apksignerextensions
 apksig_extension = use_extension("//bzlmod_extensions:apksig.bzl", "apksig_extension")
 use_repo(apksig_extension, "apksig")
+
+# rules_robolectric > 4.11.1
+RULES_ROBOLECTRIC_COMMIT = "a5b25a8c27cc6add74bb01e62cd0dc72df8933ff"
+RULES_ROBOLECTRIC_SHA = "wErQv8LAP50nd8+P4IkYczddtsi+/56ntxuy/Qp5+0c="
+archive_override(
+  module_name = "rules_robolectric",
+  urls = ["https://github.com/robolectric/robolectric-bazel/archive/%s.zip" % RULES_ROBOLECTRIC_COMMIT],
+  integrity = "sha256-%s" % RULES_ROBOLECTRIC_SHA,
+  strip_prefix = "robolectric-bazel-%s" % RULES_ROBOLECTRIC_COMMIT
+)
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Android support in Bazel
-#### test bazelci @HEAD
+
 ## Disclaimer
 
 NOTE: This branch is a development preview of the Starlark implementation of Android rules for Bazel. This code is incomplete and may not function as-is.

diff --git a/prereqs.bzl b/prereqs.bzl
@@ -88,9 +88,9 @@ def rules_android_prereqs(dev_mode = False):
     maybe(
         http_archive,
         name = "robolectric",
-        urls = ["https://github.com/robolectric/robolectric-bazel/archive/4.10.3.tar.gz"],
-        strip_prefix = "robolectric-bazel-4.10.3",
-        sha256 = "1b199a932cbde4af728dd8275937091adbb89a4bf63d326de49e6d0a42e723bf",
+        urls = ["https://github.com/robolectric/robolectric-bazel/archive/a5b25a8c27cc6add74bb01e62cd0dc72df8933ff.zip"],
+        strip_prefix = "robolectric-bazel-a5b25a8c27cc6add74bb01e62cd0dc72df8933ff",
+        sha256 = "c04ad0bfc2c03f9d2777cf8fe0891873375db6c8beff9ea7b71bb2fd0a79fb47",
     )
 
     maybe(

diff --git a/rules/android_local_test/attrs.bzl b/rules/android_local_test/attrs.bzl
@@ -178,7 +178,7 @@ def make_attrs(additional_aspects = [], native_libs_transition = None):
             robolectric_properties_file = attr.label(
                 doc = "The classpath to robolectric-deps.properties file.",
                 allow_single_file = True,
-                default = "@robolectric//bazel:android-all",
+                default = '@robolectric//bazel:properties',
             ),
             test_class = attr.string(
                 doc = """

diff --git a/rules/android_local_test/impl.bzl b/rules/android_local_test/impl.bzl
@@ -170,8 +170,7 @@ def _process_jvm(ctx, resources_ctx, **_unused_sub_ctxs):
         providers.append(AndroidFilteredJdepsInfo(jdeps = filtered_jdeps))
         runfiles.append(filtered_jdeps)
     file = ctx.file.robolectric_properties_file
-    properties = '${JAVA_RUNFILES}/' + '/'.join(file.short_path.split('/')[1:-1]) + '/robolectric-deps.properties'
-    print(">>>>>>>>>>>> ", properties)
+    properties = '${JAVA_RUNFILES}/' + '/'.join(file.short_path.split('/')[1:])
 
     return ProviderInfo(
         name = "jvm_ctx",

diff --git a/test/rules/android_binary_internal/r8_integration/r8_integration_test.py b/test/rules/android_binary_internal/r8_integration/r8_integration_test.py
@@ -17,8 +17,6 @@
 import sys
 import unittest
 import zipfile
-import sys
-
 
 
 class R8IntegrationTest(unittest.TestCase):