build/android/pylib/constants.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/pylib/constants.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 v2 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/pylib/constants.py

diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py

index 15aebaba5e011b88742de9b7f6d436caa922a605..04eafea3d6363676dff396a5c5def18f4eb2e4e0 100644

--- a/build/android/pylib/constants.py

+++ b/build/android/pylib/constants.py

@@ -13,8 +13,8 @@ import sys

DIR_SOURCE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),

os.pardir, os.pardir, os.pardir))

ISOLATE_DEPS_DIR = os.path.join(DIR_SOURCE_ROOT, 'isolate_deps_dir')

-EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(DIR_SOURCE_ROOT, os.pardir,

- os.pardir))

+EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(

Peter Beverloo 2013/09/11 13:58:08 This is now equal to the ANDROID_SDK_ROOT constant

+ DIR_SOURCE_ROOT, 'third_party', 'android_tools', 'sdk'))

# TODO(craigdh): Remove these once references have been removed downstream.

CHROME_PACKAGE = 'com.google.android.apps.chrome'