Skip to content

Commit 02bd72e

Browse files
author
JiaYan Lin
committed
fix properties file's path in android_local_test
1 parent 0a0bbed commit 02bd72e

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

MODULE.bazel

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,13 @@ use_repo(bazel_binaries, "bazel_binaries")
100100
# extension for apksignerextensions
101101
apksig_extension = use_extension("//bzlmod_extensions:apksig.bzl", "apksig_extension")
102102
use_repo(apksig_extension, "apksig")
103+
104+
# rules_robolectric > 4.11.1
105+
RULES_ROBOLECTRIC_COMMIT = "a5b25a8c27cc6add74bb01e62cd0dc72df8933ff"
106+
RULES_ROBOLECTRIC_SHA = "wErQv8LAP50nd8+P4IkYczddtsi+/56ntxuy/Qp5+0c="
107+
archive_override(
108+
module_name = "rules_robolectric",
109+
urls = ["https://github.com/robolectric/robolectric-bazel/archive/%s.zip" % RULES_ROBOLECTRIC_COMMIT],
110+
integrity = "sha256-%s" % RULES_ROBOLECTRIC_SHA,
111+
strip_prefix = "robolectric-bazel-%s" % RULES_ROBOLECTRIC_COMMIT
112+
)

prereqs.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ def rules_android_prereqs(dev_mode = False):
8888
maybe(
8989
http_archive,
9090
name = "robolectric",
91-
urls = ["https://github.com/robolectric/robolectric-bazel/archive/4.10.3.tar.gz"],
92-
strip_prefix = "robolectric-bazel-4.10.3",
93-
sha256 = "1b199a932cbde4af728dd8275937091adbb89a4bf63d326de49e6d0a42e723bf",
91+
urls = ["https://github.com/robolectric/robolectric-bazel/archive/a5b25a8c27cc6add74bb01e62cd0dc72df8933ff.zip"],
92+
strip_prefix = "robolectric-bazel-a5b25a8c27cc6add74bb01e62cd0dc72df8933ff",
93+
sha256 = "c04ad0bfc2c03f9d2777cf8fe0891873375db6c8beff9ea7b71bb2fd0a79fb47",
9494
)
9595

9696
maybe(

rules/android_local_test/attrs.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ def make_attrs(additional_aspects = [], native_libs_transition = None):
178178
robolectric_properties_file = attr.label(
179179
doc = "The classpath to robolectric-deps.properties file.",
180180
allow_single_file = True,
181-
default = "@robolectric//bazel:android-all",
181+
default = '@robolectric//bazel:properties',
182182
),
183183
test_class = attr.string(
184184
doc = """

rules/android_local_test/impl.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@ def _process_jvm(ctx, resources_ctx, **_unused_sub_ctxs):
170170
providers.append(AndroidFilteredJdepsInfo(jdeps = filtered_jdeps))
171171
runfiles.append(filtered_jdeps)
172172
file = ctx.file.robolectric_properties_file
173-
properties = '${JAVA_RUNFILES}/' + '/'.join(file.short_path.split('/')[1:-1]) + '/robolectric-deps.properties'
174-
print(">>>>>>>>>>>> ", properties)
173+
properties = '${JAVA_RUNFILES}/' + '/'.join(file.short_path.split('/')[1:])
175174

176175
return ProviderInfo(
177176
name = "jvm_ctx",
@@ -492,11 +491,12 @@ def _get_classpath(s):
492491
return "${J3}" + s.short_path
493492

494493
def _get_jvm_flags(ctx, main_class, robolectric_properties_path, additional_jvm_flags):
494+
optional_flags = [
495+
"-Drobolectric-deps.properties=" + robolectric_properties_path ] if robolectric_properties_path else []
495496
return [
496497
"-ea",
497498
"-Dbazel.test_suite=" + main_class,
498499
"-Drobolectric.offline=true",
499-
"-Drobolectric-deps.properties=" + robolectric_properties_path,
500500
"-Duse_framework_manifest_parser=true",
501501
"-Drobolectric.logging=stdout",
502502
"-Drobolectric.logging.enabled=true",
@@ -508,7 +508,7 @@ def _get_jvm_flags(ctx, main_class, robolectric_properties_path, additional_jvm_
508508
{},
509509
)
510510
for flag in ctx.attr.jvm_flags
511-
]
511+
] + optional_flags
512512

513513
def _zip_file(ctx, f, dir_name, out_zip):
514514
cmd = """

0 commit comments

Comments
 (0)