Index: build/android/pylib/instrumentation/run_java_tests.py |
diff --git a/build/android/pylib/run_java_tests.py b/build/android/pylib/instrumentation/run_java_tests.py |
similarity index 97% |
rename from build/android/pylib/run_java_tests.py |
rename to build/android/pylib/instrumentation/run_java_tests.py |
index 07b45e0ea9dfa857bafeb563699dcabfd4c14806..34ce733a67544cb2b0548721f8396ea61d44a97a 100644 |
--- a/build/android/pylib/run_java_tests.py |
+++ b/build/android/pylib/instrumentation/run_java_tests.py |
@@ -12,19 +12,21 @@ import shutil |
import sys |
import time |
-import android_commands |
+from pylib import android_commands |
+from pylib import cmd_helper |
+from pylib import constants |
+from pylib import sharded_tests_queue |
+from pylib import valgrind_tools |
+from pylib.android_commands import errors |
+from pylib.base_test_runner import BaseTestRunner |
+from pylib.base_test_sharder import BaseTestSharder, SetTestsContainer |
+from pylib.forwarder import Forwarder |
+from pylib.json_perf_parser import GetAverageRunInfoFromJSONString |
+from pylib.perf_tests_helper import PrintPerfResult |
+from pylib.test_result import SingleTestResult, TestResults |
+ |
import apk_info |
-from base_test_runner import BaseTestRunner |
-from base_test_sharder import BaseTestSharder, SetTestsContainer |
-import cmd_helper |
-import constants |
-import errors |
-from forwarder import Forwarder |
-from json_perf_parser import GetAverageRunInfoFromJSONString |
-from perf_tests_helper import PrintPerfResult |
-import sharded_tests_queue |
-from test_result import SingleTestResult, TestResults |
-import valgrind_tools |
+ |
_PERF_TEST_ANNOTATION = 'PerfTest' |