Index: build/android/pylib/gtest/test_package_apk.py |
diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py |
index 5944147bdc005af40c84b40d4263723d463af7c3..2d143b9322c06961d88737285f27643ef35b3f79 100644 |
--- a/build/android/pylib/gtest/test_package_apk.py |
+++ b/build/android/pylib/gtest/test_package_apk.py |
@@ -29,17 +29,16 @@ class TestPackageApk(TestPackage): |
suite_name: Name of the test suite (e.g. base_unittests). |
""" |
TestPackage.__init__(self, suite_name) |
- product_dir = os.path.join(cmd_helper.OutDirectory.get(), |
- constants.GetBuildType()) |
if suite_name == 'content_browsertests': |
self.suite_path = os.path.join( |
- product_dir, 'apks', '%s.apk' % suite_name) |
+ constants.GetBuildDirectory(), 'apks', '%s.apk' % suite_name) |
self._test_apk_package_name = constants.BROWSERTEST_TEST_PACKAGE_NAME |
self._test_activity_name = constants.BROWSERTEST_TEST_ACTIVITY_NAME |
self._command_line_file = constants.BROWSERTEST_COMMAND_LINE_FILE |
else: |
self.suite_path = os.path.join( |
- product_dir, '%s_apk' % suite_name, '%s-debug.apk' % suite_name) |
+ constants.GetBuildDirectory(), '%s_apk' % suite_name, |
+ '%s-debug.apk' % suite_name) |
self._test_apk_package_name = constants.GTEST_TEST_PACKAGE_NAME |
self._test_activity_name = constants.GTEST_TEST_ACTIVITY_NAME |
self._command_line_file = constants.GTEST_COMMAND_LINE_FILE |