From 1b01367b0d4e31f4a1b2759a0b41b66a20bc85d4 Mon Sep 17 00:00:00 2001
From: JiaYan Lin <jiayanl@google.com>
Date: Thu, 25 Jan 2024 03:36:45 +0000
Subject: [PATCH] fixing android_local_test

---
 rules/android_local_test/attrs.bzl | 5 +++--
 rules/android_local_test/impl.bzl  | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rules/android_local_test/attrs.bzl b/rules/android_local_test/attrs.bzl
index 4a0edc89..bb5be873 100644
--- a/rules/android_local_test/attrs.bzl
+++ b/rules/android_local_test/attrs.bzl
@@ -175,9 +175,10 @@ def make_attrs(additional_aspects = [], native_libs_transition = None):
             env = attr.string_dict(
                 doc = "A dictionary of environment variables set for the execution of the test. Will be subject to make variable and $(location) expansion.",
             ),
-            robolectric_properties_file = attr.string(
+            robolectric_properties_file = attr.label(
                 doc = "The classpath to robolectric-deps.properties file.",
-                default = "${JAVA_RUNFILES}/robolectric/bazel/robolectric-deps.properties",
+allow_single_file = True,
+                default = "@robolectric//bazel:android-all",
             ),
             test_class = attr.string(
                 doc = """
diff --git a/rules/android_local_test/impl.bzl b/rules/android_local_test/impl.bzl
index 2365c697..7fb4f0d9 100644
--- a/rules/android_local_test/impl.bzl
+++ b/rules/android_local_test/impl.bzl
@@ -169,6 +169,10 @@ def _process_jvm(ctx, resources_ctx, **_unused_sub_ctxs):
         filter_jdeps(ctx, java_info.outputs.jdeps, filtered_jdeps, utils.only(resources_ctx.r_java.compile_jars.to_list()))
         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'
+    print(">>>>>>>>>>>> ", properties)
 
     return ProviderInfo(
         name = "jvm_ctx",
@@ -178,7 +182,7 @@ def _process_jvm(ctx, resources_ctx, **_unused_sub_ctxs):
             deps = deps,
             java_start_class = java_start_class,
             coverage_start_class = coverage_start_class,
-            android_properties_file = ctx.attr.robolectric_properties_file,
+            android_properties_file = properties,
             additional_jvm_flags = [],
         ),
         runfiles = ctx.runfiles(files = runfiles),