build/android/pylib/utils/emulator.py - Issue 25675010: android: Use a separate SDK for the emulator again.

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/utils/emulator.py

Issue 25675010: android: Use a separate SDK for the emulator again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 2 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/utils/emulator.py

diff --git a/build/android/pylib/utils/emulator.py b/build/android/pylib/utils/emulator.py

index f5838353d55fea72816466cd5854a41c75161308..16c4e3648551705a931a16573dd7911cedac398a 100755

--- a/build/android/pylib/utils/emulator.py

+++ b/build/android/pylib/utils/emulator.py

@@ -171,8 +171,7 @@ class Emulator(object):

avd_name: name of the AVD to create

abi: target platform for emulator being created

"""

- android_sdk_root = os.path.join(constants.EMULATOR_SDK_ROOT,

- 'android_tools', 'sdk')

+ android_sdk_root = os.path.join(constants.EMULATOR_SDK_ROOT, 'sdk')

self.emulator = os.path.join(android_sdk_root, 'tools', 'emulator')

self.android = os.path.join(android_sdk_root, 'tools', 'android')

self.popen = None