build/android/pylib/gtest/setup.py - Issue 23480009: [Android] Fix import conflict.

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 23480009: [Android] Fix import conflict. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 4 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 f139c979081f2bd8c4841323414ddebe16e114d6..59027d60b935236d9a3c59d94569dfc0f1d482bc 100644

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

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

@@ -21,8 +21,9 @@ import test_package_exe

import test_runner

sys.path.insert(0,

- os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib'))

-from common import unittest_util

+ os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib',

+ 'common'))

+import unittest_util

_ISOLATE_FILE_PATHS = {

« no previous file with comments | « no previous file | no next file » | no next file with comments »