diff options
| author | jbudorick@chromium.org <jbudorick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 17:39:51 +0000 |
|---|---|---|
| committer | jbudorick@chromium.org <jbudorick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 17:39:51 +0000 |
| commit | 69c8b39fc8ffb99b98ef3e5996b499095bc9efd0 (patch) | |
| tree | 46189ce236ff752c0012fbbd0b78d173f6336b9d /build | |
| parent | 512e35e98ac9892c7215655479b9ba51df6b6a68 (diff) | |
| download | chromium_src-69c8b39fc8ffb99b98ef3e5996b499095bc9efd0.zip chromium_src-69c8b39fc8ffb99b98ef3e5996b499095bc9efd0.tar.gz chromium_src-69c8b39fc8ffb99b98ef3e5996b499095bc9efd0.tar.bz2 | |
[Android] Fix gtest test scripts for non-default CHROMIUM_OUT_DIR.
BUG=347834
Review URL: https://codereview.chromium.org/184733006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/gtest/setup.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py index 86d816f..01683de 100644 --- a/build/android/pylib/gtest/setup.py +++ b/build/android/pylib/gtest/setup.py @@ -164,19 +164,22 @@ def _GenerateDepsDirUsingIsolate(suite_name): # On Android, all pak files need to be in the top-level 'paks' directory. paks_dir = os.path.join(constants.ISOLATE_DEPS_DIR, 'paks') os.mkdir(paks_dir) - for root, _, filenames in os.walk(os.path.join(constants.ISOLATE_DEPS_DIR, - 'out')): + + deps_out_dir = os.path.join( + constants.ISOLATE_DEPS_DIR, + os.path.relpath(os.path.join(constants.GetOutDirectory(), os.pardir), + constants.DIR_SOURCE_ROOT)) + for root, _, filenames in os.walk(deps_out_dir): for filename in fnmatch.filter(filenames, '*.pak'): shutil.move(os.path.join(root, filename), paks_dir) # Move everything in PRODUCT_DIR to top level. - deps_product_dir = os.path.join(constants.ISOLATE_DEPS_DIR, 'out', - constants.GetBuildType()) + deps_product_dir = os.path.join(deps_out_dir, constants.GetBuildType()) if os.path.isdir(deps_product_dir): for p in os.listdir(deps_product_dir): shutil.move(os.path.join(deps_product_dir, p), constants.ISOLATE_DEPS_DIR) os.rmdir(deps_product_dir) - os.rmdir(os.path.join(constants.ISOLATE_DEPS_DIR, 'out')) + os.rmdir(deps_out_dir) def _GetDisabledTestsFilterFromFile(suite_name): |