Internal change PiperOrigin-RevId: 934637027 Change-Id: Ic00ec83ae0533dde456cdacd94c47aa22adeecaa
diff --git a/rules/android_local_test/impl.bzl b/rules/android_local_test/impl.bzl index fdf6923..3bbe206 100644 --- a/rules/android_local_test/impl.bzl +++ b/rules/android_local_test/impl.bzl
@@ -487,9 +487,9 @@ def _get_jvm_flags(ctx, main_class, robolectric_properties_path, additional_jvm_flags): jni_paths = _get_jni_library_paths(ctx) - library_path_flag = "-Djava.library.path=java/jni/lib" + library_path_flags = [] if jni_paths: - library_path_flag += ":" + ":".join(jni_paths) + library_path_flags.append("-Djava.library.path=java/jni/lib:" + ":".join(jni_paths)) return [ "-ea", "-Dbazel.test_suite=" + main_class, @@ -499,8 +499,7 @@ "-Drobolectric.logging=stdout", "-Drobolectric.logging.enabled=true", "-Dorg.robolectric.packagesToNotAcquire=com.google.testing.junit.runner.util", - library_path_flag, - ] + DEFAULT_JIT_FLAGS + DEFAULT_GC_FLAGS + DEFAULT_VERIFY_FLAGS + additional_jvm_flags + [ + ] + library_path_flags + DEFAULT_JIT_FLAGS + DEFAULT_GC_FLAGS + DEFAULT_VERIFY_FLAGS + additional_jvm_flags + [ ctx.expand_make_variables( "jvm_flags", ctx.expand_location(flag, ctx.attr.data),