summaryrefslogtreecommitdiffstats
path: root/build/android/pylib/test_options_parser.py
diff options
context:
space:
mode:
authorshashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 21:52:16 +0000
committershashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 21:52:16 +0000
commit8cc306fd3a70d22b1e55f2e3f9fcd6f1f19e25d6 (patch)
tree7e07ff9f415de840bacdab146a7241733d591da7 /build/android/pylib/test_options_parser.py
parent80d44ec2f654cb9c6b1a7d8a2f717bdef20c2e06 (diff)
downloadchromium_src-8cc306fd3a70d22b1e55f2e3f9fcd6f1f19e25d6.zip
chromium_src-8cc306fd3a70d22b1e55f2e3f9fcd6f1f19e25d6.tar.gz
chromium_src-8cc306fd3a70d22b1e55f2e3f9fcd6f1f19e25d6.tar.bz2
Remove -debug suffix in apk names.
-debug suffix is used even for Release builds, remove this suffix now apk name will have no suffix in either Debug or Release builds. BUG=155946 Review URL: https://chromiumcodereview.appspot.com/11221003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib/test_options_parser.py')
-rw-r--r--build/android/pylib/test_options_parser.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/build/android/pylib/test_options_parser.py b/build/android/pylib/test_options_parser.py
index ee00f1f..2f47328 100644
--- a/build/android/pylib/test_options_parser.py
+++ b/build/android/pylib/test_options_parser.py
@@ -126,15 +126,14 @@ def ValidateInstrumentationOptions(option_parser, options, args):
elif options.python_only:
options.run_java_tests = False
- # In case of SDK Build, the jars and apks have a -debug suffix.
options.test_apk_path = os.path.join(_SDK_OUT_DIR,
options.build_type,
constants.SDK_BUILD_APKS_DIR,
- '%s-debug.apk' % options.test_apk)
+ '%s.apk' % options.test_apk)
options.test_apk_jar_path = os.path.join(_SDK_OUT_DIR,
options.build_type,
constants.SDK_BUILD_TEST_JAVALIB_DIR,
- '%s-debug.jar' % options.test_apk)
+ '%s.jar' % options.test_apk)
if options.annotation_str:
options.annotation = options.annotation_str.split()
elif options.test_filter: