[Android] Separate concepts of pushing test data and installing test apk.

build/android/pylib/utils/test_options_parser.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Parses options for the instrumentation tests."""
 
 #TODO(craigdh): pylib/utils/ should not depend on pylib/.
 from pylib import constants
 
 import optparse
@@ skipping 73 matching lines @@
   option_parser.add_option('--tool',
                            dest='tool',
                            help='Run the test under a tool '
                            '(use --tool help to list them)')
   option_parser.add_option('--flakiness-dashboard-server',
                            dest='flakiness_dashboard_server',
                            help=('Address of the server that is hosting the '
                                  'Chrome for Android flakiness dashboard.'))
   option_parser.add_option('--skip-deps-push', dest='push_deps',
                            action='store_false', default=True,
-                           help='Do not push dependencies to the device. '
+                           help='Do not push data dependencies to the device. '
                                 'Use this at own risk for speeding up test '
                                 'execution on local machine.')
   AddBuildTypeOption(option_parser)
 
 
 def AddGTestOptions(option_parser):
   """Decorates OptionParser with GTest tests options."""
 
   AddTestRunnerOptions(option_parser, default_timeout=0)
   option_parser.add_option('-s', '--suite', dest='test_suite',
@@ skipping 182 matching lines @@
     # The dexed JAR is fully qualified, assume the info JAR lives along side.
     options.uiautomator_jar = options.test_jar
   else:
     options.uiautomator_jar = os.path.join(
         _SDK_OUT_DIR, options.build_type, constants.SDK_BUILD_JAVALIB_DIR,
         '%s.dex.jar' % options.test_jar)
   options.uiautomator_info_jar = (
       options.uiautomator_jar[:options.uiautomator_jar.find('.dex.jar')] +
       '_java.jar')