build/android/pylib/gtest/test_package_apk.py - Issue 22903016: [android] Adds constants.GetOutDirectory() and converts test scripts to use it.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/gtest/test_package_apk.py

Issue 22903016: [android] Adds constants.GetOutDirectory() and converts test scripts to use it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix provision_devices.py which never set the build type Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/android/pylib/gtest/test_package_apk.py

diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py

index 81c4cfed92ec9b5ca6710ec5f1ff9a4908609903..5aa473eca4c28106c3e0c1121bd773191c426ea2 100644

--- a/build/android/pylib/gtest/test_package_apk.py

+++ b/build/android/pylib/gtest/test_package_apk.py

@@ -29,15 +29,14 @@ class TestPackageApk(TestPackage):

suite_name: Name of the test suite (e.g. base_unittests).

"""

TestPackage.__init__(self, suite_name)

- product_dir = os.path.join(cmd_helper.OutDirectory.get(),

- constants.GetBuildType())

if suite_name == 'content_browsertests':

self.suite_path = os.path.join(

- product_dir, 'apks', '%s.apk' % suite_name)

+ constants.GetOutDirectory(), 'apks', '%s.apk' % suite_name)

self._package_info = constants.PACKAGE_INFO['content_browsertests']

else:

self.suite_path = os.path.join(

- product_dir, '%s_apk' % suite_name, '%s-debug.apk' % suite_name)

+ constants.GetOutDirectory(), '%s_apk' % suite_name,

+ '%s-debug.apk' % suite_name)

self._package_info = constants.PACKAGE_INFO['gtest']

def _CreateCommandLineFileOnDevice(self, adb, options):

« no previous file with comments | « build/android/pylib/gtest/setup.py ('k') | build/android/pylib/gtest/test_package_exe.py » ('j') | no next file with comments »