build/android/pylib/gtest/setup.py - Issue 557463002: Make base_unittests_apk actually work

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/setup.py

Issue 557463002: Make base_unittests_apk actually work (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-group-datadeps

Patch Set: Rebase Created 6 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:

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

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

index b278c09393e86438c75e53a4ef5390d102f95a25..4e965ef4a9f2a36a553bcbe6f47391b9d7e08a3c 100644

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

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

@@ -294,12 +294,16 @@ def Setup(test_options, devices):

"""

test_package = test_package_apk.TestPackageApk(test_options.suite_name)

if not os.path.exists(test_package.suite_path):

- test_package = test_package_exe.TestPackageExecutable(

+ exe_test_package = test_package_exe.TestPackageExecutable(

test_options.suite_name)

- if not os.path.exists(test_package.suite_path):

+ if not os.path.exists(exe_test_package.suite_path):

raise Exception(

- 'Did not find %s target. Ensure it has been built.'

- % test_options.suite_name)

+ 'Did not find %s target. Ensure it has been built.\n'

+ '(not found at %s or %s)'

+ % (test_options.suite_name,

+ test_package.suite_path,

+ exe_test_package.suite_path))

+ test_package = exe_test_package

logging.warning('Found target %s', test_package.suite_path)

_GenerateDepsDirUsingIsolate(test_options.suite_name,

« no previous file with comments | « build/android/gyp/write_ordered_libraries.py ('k') | build/config/BUILDCONFIG.gn » ('j') | no next file with comments »