summaryrefslogtreecommitdiffstats
path: root/build/android/pylib/test_options_parser.py
diff options
context:
space:
mode:
authorfrankf@google.com <frankf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 01:43:22 +0000
committerfrankf@google.com <frankf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 01:43:22 +0000
commit1e18c15affda4732439a48af2da6a197cab72fc8 (patch)
tree20423f77a9f7f54044a3b2edb4faa79de5fe3354 /build/android/pylib/test_options_parser.py
parentabaea1f07a9bf3cf776348109e9aded3143ad944 (diff)
downloadchromium_src-1e18c15affda4732439a48af2da6a197cab72fc8.zip
chromium_src-1e18c15affda4732439a48af2da6a197cab72fc8.tar.gz
chromium_src-1e18c15affda4732439a48af2da6a197cab72fc8.tar.bz2
[Android] Fix the bug when full path to test apk is provided.
BUG= Review URL: https://codereview.chromium.org/11642049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib/test_options_parser.py')
-rw-r--r--build/android/pylib/test_options_parser.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/android/pylib/test_options_parser.py b/build/android/pylib/test_options_parser.py
index 65399aa..9338264 100644
--- a/build/android/pylib/test_options_parser.py
+++ b/build/android/pylib/test_options_parser.py
@@ -167,7 +167,8 @@ def ValidateInstrumentationOptions(option_parser, options, args):
if os.path.exists(options.test_apk):
# The APK is fully qualified, assume the JAR lives along side.
options.test_apk_path = options.test_apk
- options.test_apk_jar_path = os.path.splitext(options.test_apk_path) + '.jar'
+ options.test_apk_jar_path = (os.path.splitext(options.test_apk_path)[0] +
+ '.jar')
else:
options.test_apk_path = os.path.join(_SDK_OUT_DIR,
options.build_type,