build/android/pylib/__init__.py - Issue 15891002: Android: allows using adb from a chromium checkout without envsetup.sh

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: build/android/pylib/init.py

Issue 15891002: Android: allows using adb from a chromium checkout without envsetup.sh (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: which adb, devnull Created 7 years, 6 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:

OLD	NEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

	5 import os

	6 import subprocess

	7

	8

	9 if not os.environ.get('ANDROID_SDK_ROOT'):

	10 # If envsetup.sh hasn't been sourced and there's no adb in the path,

	11 # set it here.

	12 with file(os.devnull, 'w') as devnull:

	13 ret = subprocess.call(['which', 'adb'], stdout=devnull, stderr=devnull)

	14 if ret:

	15 print 'No adb found in $PATH, fallback to checked in binary.'

	16 os.environ['PATH'] += os.pathsep + os.path.abspath(os.path.join(

	17 os.path.dirname(__file__),

	18 '..', '..', '..',

	19 'third_party', 'android_tools', 'sdk', 'platform-tools'))

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »