diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 21:12:36 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 21:12:36 +0000 |
| commit | 5f5ceac025eddcd970426f5814e1fdae9c4d4f70 (patch) | |
| tree | d6b5edbb5772e8f98b676c672c166a681d983863 /build | |
| parent | a3d5570ff21d1a43ae7bce3a91c1274d8b30c4d7 (diff) | |
| download | chromium_src-5f5ceac025eddcd970426f5814e1fdae9c4d4f70.zip chromium_src-5f5ceac025eddcd970426f5814e1fdae9c4d4f70.tar.gz chromium_src-5f5ceac025eddcd970426f5814e1fdae9c4d4f70.tar.bz2 | |
Move third_party/android/testrunner to third_party/android_testrunner
The original intent was to have multiple subdirectories under
third_party/android/, but the need for these has not arisen and it potentially
adds complexity.
Also update the license checker tool to prune this directory, as the code is
used only for testing.
'tools/licenses.py scan | grep android'
See http://codereview.chromium.org/8322008.
Review URL: http://codereview.chromium.org/9622010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/android_commands.py | 8 | ||||
| -rwxr-xr-x | build/android/emulator.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build/android/android_commands.py b/build/android/android_commands.py index 007d040..d8692ec 100755 --- a/build/android/android_commands.py +++ b/build/android/android_commands.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -23,12 +23,12 @@ import sys import tempfile import time -# adb_interface.py is under ../../third_party/android/testrunner/ +# adb_interface.py is under ../../third_party/android_testrunner/ sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', - '..', 'third_party', 'android', 'testrunner')) + '..', 'third_party', 'android_testrunner')) import adb_interface import cmd_helper -import errors # is under ../../third_party/android/testrunner/errors.py +import errors # is under ../../third_party/android_testrunner/errors.py from run_tests_helper import IsRunningAsBuildbot diff --git a/build/android/emulator.py b/build/android/emulator.py index 19cfe03..b3259c9 100755 --- a/build/android/emulator.py +++ b/build/android/emulator.py @@ -20,9 +20,9 @@ import time import android_commands -# adb_interface.py is under ../../third_party/android/testrunner/ +# adb_interface.py is under ../../third_party/android_testrunner/ sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', - '..', 'third_party', 'android', 'testrunner')) + '..', 'third_party', 'android_testrunner')) import adb_interface import cmd_helper import errors |