(Reland) Expose resources in Robolectric/JUnit tests.

build/android/pylib/junit/junit_test_instance.py

Index: build/android/pylib/junit/junit_test_instance.py
diff --git a/build/android/pylib/junit/junit_test_instance.py b/build/android/pylib/junit/junit_test_instance.py
index 5fd6af995c384e3f49225ccc4ba8b33d3c34665a..1baf8fc5c99c00a8b32436490baacfe3af14c598 100644
--- a/build/android/pylib/junit/junit_test_instance.py
+++ b/build/android/pylib/junit/junit_test_instance.py
@@ -10,8 +10,12 @@ class JunitTestInstance(test_instance.TestInstance):
   def __init__(self, args, _):
     super(JunitTestInstance, self).__init__()
 
+    self._android_manifest_path = args.android_manifest_path
     self._coverage_dir = args.coverage_dir
     self._package_filter = args.package_filter
+    self._package_name = args.package_name
+    self._resource_zips = args.resource_zips
+    self._robolectric_runtime_deps_dir = args.robolectric_runtime_deps_dir
     self._runner_filter = args.runner_filter
     self._test_filter = args.test_filter
     self._test_suite = args.test_suite
@@ -29,6 +33,10 @@ class JunitTestInstance(test_instance.TestInstance):
     pass
 
   @property
+  def android_manifest_path(self):
+    return self._android_manifest_path
+
+  @property
   def coverage_dir(self):
     return self._coverage_dir
 
@@ -37,6 +45,18 @@ class JunitTestInstance(test_instance.TestInstance):
     return self._package_filter
 
   @property
+  def package_name(self):
+    return self._package_name
+
+  @property
+  def resource_zips(self):
+    return self._resource_zips
+
+  @property
+  def robolectric_runtime_deps_dir(self):
+    return self._robolectric_runtime_deps_dir
+
+  @property
   def runner_filter(self):
     return self._runner_filter