build/android/avd.py - Issue 23513022: android: Point EMULATOR_SDK_ROOT to a location inside the repository.

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

Issue 23513022: android: Point EMULATOR_SDK_ROOT to a location inside the repository. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Patch v3: get rid of EMULATOR_SDK_ROOT altogether 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:

Index: build/android/avd.py

diff --git a/build/android/avd.py b/build/android/avd.py

index 2685c592bedf4d4f276169a99741b3d374f6d377..76107651f3378e1f7776036663d0b91986985691 100755

--- a/build/android/avd.py

+++ b/build/android/avd.py

@@ -23,9 +23,7 @@ from pylib.utils import emulator

def main(argv):

# ANDROID_SDK_ROOT needs to be set to the location of the SDK used to launch

# the emulator to find the system images upon launch.

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

- 'android_tools', 'sdk')

- os.environ['ANDROID_SDK_ROOT'] = emulator_sdk

+ os.environ['ANDROID_SDK_ROOT'] = constants.ANDROID_SDK_ROOT

Peter Beverloo 2013/09/11 17:29:35 nit: should we allow overriding of the ANDROID_SDK

opt_parser = optparse.OptionParser(description='AVD script.')

opt_parser.add_option('-n', '--num', dest='emulator_count',