commit 3bc1e4668383230ac1ad011d8f0c0c4f6e522c46
author Jean-Luc Brouillet <jeanluc@google.com> Mon Jul 21 16:08:18 2014 -0700
committer Jean-Luc Brouillet <jeanluc@google.com> Mon Jul 21 16:09:31 2014 -0700
tree 50914bd2e97cdfc4774183235b2d6744f8ba77d4
parent 51324e22d1df8a169d70e1b6ee8c0ebb65a5ba47

Fix directory where CtsTestStubs.apk is found.

Empirically, it's now found in a subdirectory named CtsTestStubs.

Change-Id: Iae50c37ac7655f0b32cc2cc5a1b50371d1397b54

testrunner/runtest.py

diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index d367904..f9f4771 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -376,7 +376,7 @@
         if is_cts:
           # hack! hardcode install of CtsTestStubs
           out = android_build.GetTestAppPath()
-          abs_install_path = os.path.join(out, "CtsTestStubs.apk")
+          abs_install_path = os.path.join(out, "CtsTestStubs", "CtsTestStubs.apk")
           logger.Log("adb install -r %s" % abs_install_path)
           logger.Log(self._adb.Install(abs_install_path))