10 files changed, 7 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
diff --git a/third_party/android/testrunner/LICENSE b/third_party/android_testrunner/LICENSE
index d645695..d645695 100644
--- a/third_party/android/testrunner/LICENSE
+++ b/third_party/android_testrunner/LICENSE
diff --git a/third_party/android/testrunner/README.chromium b/third_party/android_testrunner/README.chromium
index c8a97fa..c8a97fa 100644
--- a/third_party/android/testrunner/README.chromium
+++ b/third_party/android_testrunner/README.chromium
diff --git a/third_party/android/testrunner/adb_interface.py b/third_party/android_testrunner/adb_interface.py
index 1928c73..1928c73 100644
--- a/third_party/android/testrunner/adb_interface.py
+++ b/third_party/android_testrunner/adb_interface.py
diff --git a/third_party/android/testrunner/am_instrument_parser.py b/third_party/android_testrunner/am_instrument_parser.py
index 4554c4d..4554c4d 100644
--- a/third_party/android/testrunner/am_instrument_parser.py
+++ b/third_party/android_testrunner/am_instrument_parser.py
diff --git a/third_party/android/testrunner/errors.py b/third_party/android_testrunner/errors.py
index e163dd45..e163dd45 100644
--- a/third_party/android/testrunner/errors.py
+++ b/third_party/android_testrunner/errors.py
diff --git a/third_party/android/testrunner/logger.py b/third_party/android_testrunner/logger.py
index 61463a1..61463a1 100644
--- a/third_party/android/testrunner/logger.py
+++ b/third_party/android_testrunner/logger.py
diff --git a/third_party/android/testrunner/run_command.py b/third_party/android_testrunner/run_command.py
index d398daa..d398daa 100644
--- a/third_party/android/testrunner/run_command.py
+++ b/third_party/android_testrunner/run_command.py
diff --git a/tools/licenses.py b/tools/licenses.py
index 0889d06..082bebb 100755
--- a/tools/licenses.py
+++ b/tools/licenses.py
@@ -61,6 +61,7 @@ PRUNE_PATHS = set([
     os.path.join('v8','src','third_party','valgrind'),
 
     # Used for development and test, not in the shipping product.
+    os.path.join('third_party','android_testrunner'),
     os.path.join('third_party','bidichecker'),
     os.path.join('third_party','cygwin'),
     os.path.join('third_party','gold'),