From 8cc306fd3a70d22b1e55f2e3f9fcd6f1f19e25d6 Mon Sep 17 00:00:00 2001 From: "shashishekhar@chromium.org" Date: Thu, 18 Oct 2012 21:52:16 +0000 Subject: 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 --- build/android/pylib/test_options_parser.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'build/android/pylib/test_options_parser.py') 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: -- cgit v1.1