build/android/pylib/utils/emulator.py - Issue 1341503002: fix emulator.py by using Android SDK in third_party/android_tools instead of downloading adt

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 1341503002: fix emulator.py by using Android SDK in third_party/android_tools instead of downloading adt (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

View side-by-side diff with in-line comments

Download patch

Index: build/android/pylib/utils/emulator.py

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

index 05fb9cfd64579d3cadb8604d0dc53c8bfbe0e3d6..a4222b4f2266ecd9b8433b6014083b852c85f778 100644

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

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

@@ -49,7 +49,7 @@ hw.trackBall=no

hw.device.name=Galaxy Nexus

hw.battery=yes

hw.sensors.proximity=yes

-image.sysdir.1=system-images/android-{api.level}/{abi.type}/

+image.sysdir.1=system-images/android-{api.level}/default/{abi.type}/

hw.sensors.orientation=yes

hw.audioInput=yes

hw.camera.front=none

@@ -234,7 +234,7 @@ class Emulator(object):

avd_name: name of the AVD to create

abi: target platform for emulator being created, defaults to x86

"""

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

+ android_sdk_root = constants.ANDROID_SDK_ROOT

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

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

self.popen = None

« build/android/install_emulator_deps.py ('K') | « build/android/pylib/constants/__init__.py ('k') | no next file » | no next file with comments »