diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 13:39:24 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 13:39:24 +0000 |
| commit | 647f5b6fcebc283549961cc01a5f3688d91108f7 (patch) | |
| tree | 7c7c2232b8ff8fd9e37811265c354f035bc128d5 | |
| parent | 102f0fec791712701da89722f254d67822a4661c (diff) | |
| download | chromium_src-647f5b6fcebc283549961cc01a5f3688d91108f7.zip chromium_src-647f5b6fcebc283549961cc01a5f3688d91108f7.tar.gz chromium_src-647f5b6fcebc283549961cc01a5f3688d91108f7.tar.bz2 | |
Android: removes pylib.constants.CHROME_DIR.
Follow up from crrev.com/204357, it has now rolled downstream
so it's safe to remove the constant.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/15839006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204812 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | build/android/device_status_check.py | 4 | ||||
| -rw-r--r-- | build/android/pylib/constants.py | 2 | ||||
| -rwxr-xr-x | tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/build/android/device_status_check.py b/build/android/device_status_check.py index 50fca85..e7ab75d9 100755 --- a/build/android/device_status_check.py +++ b/build/android/device_status_check.py @@ -41,8 +41,8 @@ def DeviceInfo(serial): 'getprop ro.setupwizard.mode') == 'DISABLED' battery = AdbShellCmd('dumpsys battery') install_output = GetCmdOutput( - ['%s/build/android/adb_install_apk.py' % constants.CHROME_DIR, '--apk', - '%s/build/android/CheckInstallApk-debug.apk' % constants.CHROME_DIR]) + ['%s/build/android/adb_install_apk.py' % constants.DIR_SOURCE_ROOT, '--apk', + '%s/build/android/CheckInstallApk-debug.apk' % constants.DIR_SOURCE_ROOT]) install_speed_found = re.findall('(\d+) KB/s', install_output) if install_speed_found: install_speed = int(install_speed_found[0]) diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py index 3812fc2..519cc97 100644 --- a/build/android/pylib/constants.py +++ b/build/android/pylib/constants.py @@ -11,8 +11,6 @@ import sys DIR_SOURCE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir)) -# TODO(bulach): remove this. -CHROME_DIR = DIR_SOURCE_ROOT EMULATOR_SDK_ROOT = os.path.abspath(os.path.join(DIR_SOURCE_ROOT, os.pardir, os.pardir)) diff --git a/tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py b/tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py index f660f1f..c2e1531 100755 --- a/tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py +++ b/tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py @@ -32,8 +32,8 @@ def main(argv): options, _ = parser.parse_args() if not options.known_bugs: - options.known_bugs = os.path.join(constants.CHROME_DIR, 'tools', 'android', - 'findbugs_plugin', 'test', + options.known_bugs = os.path.join(constants.DIR_SOURCE_ROOT, 'tools', + 'android', 'findbugs_plugin', 'test', 'expected_result.txt') if not options.only_analyze: options.only_analyze = 'org.chromium.tools.findbugs.plugin.*' |