[Android] Changes python_test_root to host-driven-root

NOTRY=True
BUG=271802

Review URL: https://chromiumcodereview.appspot.com/22982007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@217587 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/buildbot/bb_device_steps.py

@@ -166,7 +166,7 @@ def RunInstrumentationSuite(options, test, flunk_on_failure=True,
     args.append('--flakiness-dashboard-server=%s' %
                 options.flakiness_server)
   if test.host_driven_root:
-    args.append('--python_test_root=%s' % test.host_driven_root)
+    args.append('--host-driven-root=%s' % test.host_driven_root)
   if test.annotation:
     args.extend(['-A', test.annotation])
   if test.exclude_annotation:

android/test_runner.py

@@ -217,7 +217,8 @@ def AddInstrumentationTestOptions(option_parser):
   option_parser.add_option('-p', '--python_only', action='store_true',
                            default=False,
                            help='Run only the host-driven tests.')
-  option_parser.add_option('--python_test_root',
+  option_parser.add_option('--python_test_root', '--host-driven-root',
+                           dest='host_driven_root',
                            help='Root of the host-driven tests.')
   option_parser.add_option('-w', '--wait_debugger', dest='wait_for_debugger',
                            action='store_true',
@@ -253,7 +254,7 @@ def ProcessInstrumentationOptions(options, error_func):
   elif options.python_only:
     options.run_java_tests = False
 
-  if not options.python_test_root:
+  if not options.host_driven_root:
     options.run_python_tests = False
 
   if not options.test_apk:
@@ -521,7 +522,7 @@ def _RunInstrumentationTests(options, error_func):
 
   if options.run_python_tests:
     runner_factory, tests = host_driven_setup.InstrumentationSetup(
-        options.python_test_root, options.official_build,
+        options.host_driven_root, options.official_build,
         instrumentation_options)
 
     if tests: