From 9fb2a26f548cfc8c8e007ccd0ad9d5db63d42cac Mon Sep 17 00:00:00 2001
From: JiaYan Lin <jiayanl@google.com>
Date: Thu, 25 Jan 2024 17:28:25 +0000
Subject: [PATCH] fix android_local_test

---
 MODULE.bazel                       | 2 +-
 rules/android_local_test/attrs.bzl | 2 +-
 rules/android_local_test/impl.bzl  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index a03cf908..c3cb43f4 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -13,7 +13,7 @@ use_repo(rules_java_toolchains, "remote_java_tools")
 bazel_dep(name = "protobuf", version = "3.19.0", repo_name = "com_google_protobuf")
 bazel_dep(name = "rules_jvm_external", version = "4.5")
 bazel_dep(name = "bazel_skylib", version = "1.0.3")
-bazel_dep(name = "rules_robolectric", version = "4.10", repo_name = "robolectric")
+bazel_dep(name = "rules_robolectric", version = "4.11.1", repo_name = "robolectric")
 
 register_toolchains("//toolchains/android:all")
 
diff --git a/rules/android_local_test/attrs.bzl b/rules/android_local_test/attrs.bzl
index bb5be873..f44f33de 100644
--- a/rules/android_local_test/attrs.bzl
+++ b/rules/android_local_test/attrs.bzl
@@ -177,7 +177,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,
+                allow_single_file = True,
                 default = "@robolectric//bazel:android-all",
             ),
             test_class = attr.string(
diff --git a/rules/android_local_test/impl.bzl b/rules/android_local_test/impl.bzl
index 7fb4f0d9..0077adaa 100644
--- 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
-    print(">>>>>>>>>> ", file, ctx.file.robolectric_properties_file)
-    properties =  '${JAVA_RUNFILES}/' + '/'.join(file.path.split('/')[:-1]) + '/' + 'robolectric-deps.properties'
+    properties = '${JAVA_RUNFILES}/' + '/'.join(file.short_path.split('/')[1:-1]) + '/robolectric-deps.properties'
     print(">>>>>>>>>>>> ", properties)
 
     return ProviderInfo(