am 62e0ab89: am 58668fc5: Merge "Fix directory where CtsTestStubs.apk is found." into lmp-dev

* commit '62e0ab8946f85fba197518771c9fa7b1d8951306':
  Fix directory where CtsTestStubs.apk is found.
This commit is contained in:
Jean-Luc Brouillet
2014-07-22 21:55:52 +00:00
committed by Android Git Automerger

View File

@@ -376,7 +376,7 @@ class TestRunner(object):
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))