build/android/pylib/instrumentation/apk_info.py - Issue 11666023: Move android buildbot test logic into python

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/instrumentation/apk_info.py

Issue 11666023: Move android buildbot test logic into python (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 11 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/instrumentation/apk_info.py

diff --git a/build/android/pylib/instrumentation/apk_info.py b/build/android/pylib/instrumentation/apk_info.py

index 46f0d7bb9f161d088f1a8221b2e176ecf8fbbdc0..fc7dcdfd9d05da67af4daddeb04c426b7e44c85b 100644

--- a/build/android/pylib/instrumentation/apk_info.py

+++ b/build/android/pylib/instrumentation/apk_info.py

@@ -5,6 +5,7 @@

"""Gathers information about APKs."""

import collections

+import constants

import logging

import os

import pickle

@@ -32,7 +33,8 @@ class ApkInfo(object):

"""Helper class for inspecting APKs."""

def __init__(self, apk_path, jar_path):

- self._PROGUARD_PATH = os.path.join(os.environ['ANDROID_SDK_ROOT'],

+ sdk_root = os.getenv('ANDROID_SDK_ROOT', constants.ANDROID_SDK_ROOT)

+ self._PROGUARD_PATH = os.path.join(sdk_root,

'tools/proguard/bin/proguard.sh')

if not os.path.exists(self._PROGUARD_PATH):

self._PROGUARD_PATH = os.path.join(os.environ['ANDROID_BUILD_TOP'],

« no previous file with comments | « build/android/pylib/constants.py ('k') | build/android/pylib/utils/test_options_parser.py » ('j') | no next file with comments »