Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: build/android/pylib/gtest/setup.py

Issue 22903016: [android] Adds constants.GetOutDirectory() and converts test scripts to use it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update adb_install_apk.py Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/android/pylib/gtest/setup.py
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
index 44fef19feb8405a2c9542d0f50a8c7e07636087d..a38232a6aa31c01ec87260db07937ddc01eaf59d 100644
--- a/build/android/pylib/gtest/setup.py
+++ b/build/android/pylib/gtest/setup.py
@@ -75,10 +75,6 @@ def _GenerateDepsDirUsingIsolate(suite_name):
Args:
suite_name: Name of the test suite (e.g. base_unittests).
"""
- product_dir = os.path.join(cmd_helper.OutDirectory.get(),
- constants.GetBuildType())
- assert os.path.isabs(product_dir)
-
if os.path.isdir(constants.ISOLATE_DEPS_DIR):
shutil.rmtree(constants.ISOLATE_DEPS_DIR)
@@ -89,14 +85,14 @@ def _GenerateDepsDirUsingIsolate(suite_name):
isolate_abs_path = os.path.join(constants.DIR_SOURCE_ROOT, isolate_rel_path)
isolated_abs_path = os.path.join(
- product_dir, '%s.isolated' % suite_name)
+ constants.GetBuildDirectory(), '%s.isolated' % suite_name)
assert os.path.exists(isolate_abs_path)
isolate_cmd = [
'python', _ISOLATE_SCRIPT,
'remap',
'--isolate', isolate_abs_path,
'--isolated', isolated_abs_path,
- '-V', 'PRODUCT_DIR=%s' % product_dir,
+ '-V', 'PRODUCT_DIR=%s' % constants.GetBuildDirectory(),
'-V', 'OS=android',
'--outdir', constants.ISOLATE_DEPS_DIR,
]

Powered by Google App Engine
This is Rietveld 408576698