build/android/install_emulator_deps.py - Issue 13543008: Fix AVD configuration and defaults based on dogfooder input.

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

Issue 13543008: Fix AVD configuration and defaults based on dogfooder input. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed misleading comment. Created 7 years, 8 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

« no previous file with comments | « build/android/avd_configs/AVD_for_Galaxy_Nexus_by_Google_x86.avd/config.ini ('k') | build/android/pylib/utils/emulator.py » ('j') | build/android/pylib/utils/emulator.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/install_emulator_deps.py

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

index ff84367a7ec0bf7fed7d4a890cf0ae79c411ca66..ed6ab5e8f96ffa79a0557dc35bc0cd2870fd00ed 100755

--- a/build/android/install_emulator_deps.py

+++ b/build/android/install_emulator_deps.py

@@ -59,7 +59,11 @@ def CheckKVM():

Returns:

True if kvm-ok returns 0 (already enabled)

"""

- rc = cmd_helper.RunCmd(['kvm-ok'])

+ try:

+ rc = cmd_helper.RunCmd(['kvm-ok'])

+ except Exception, e:

frankf 2013/04/09 17:16:48 please avoid using general exceptions.

navabi 2013/04/09 21:53:55 Done. Rebased with this committed CL as part of fi

+ logging.info('kvm-ok not installed')

+ return False

return not rc

@@ -131,6 +135,8 @@ def main(argv):

else:

GetSDK()

+ logging.info('Emulator deps for ARM emulator complete.')

if CheckX86Image():

logging.info('system-images directory already exists.')

else: