diff options
| author | Ying Chen <chying@google.com> | 2015-11-19 18:25:29 -0800 |
|---|---|---|
| committer | Ying Chen <chying@google.com> | 2015-11-19 18:25:29 -0800 |
| commit | 162d0c223d4a682b63ed57d137816a974f8ad5a1 (patch) | |
| tree | 2fe15bcd682a885aceef28cb771fe730d167ed5f | |
| parent | 623d739a3d4b1b15b63e2568b004e095fb84418b (diff) | |
| download | adt-infra-162d0c223d4a682b63ed57d137816a974f8ad5a1.tar.gz | |
Use full path to cygwin find on Windows
- Apparently putting cygwin path ahead of windows system path doesn't
make cygwin find being used. There must be some recipe engine wrapper
modifying the system environment. Use full path on Windows instead.
Change-Id: Ib749e3f0e0a3835da127ee3161a9efd7f14cc624
| -rw-r--r-- | build/scripts/slave/recipes/adt/adt.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/scripts/slave/recipes/adt/adt.py b/build/scripts/slave/recipes/adt/adt.py index 2d10b6d0..1a5d3600 100644 --- a/build/scripts/slave/recipes/adt/adt.py +++ b/build/scripts/slave/recipes/adt/adt.py @@ -31,6 +31,7 @@ def RunSteps(api): emulator_path = download_path.join('tools', 'emulator') env_path = ['%(PATH)s'] + find_cmd = 'find' # find android sdk root directory home_dir = os.path.expanduser('~') @@ -50,6 +51,7 @@ def RunSteps(api): gnu_path = 'C:\\Program Files\\GnuWin32\\bin' cygwin_path = 'C:\\cygwin\\bin' env_path = [gnu_path, cygwin_path] + env_path + find_cmd = '%s\\find' % cygwin_path else: raise @@ -67,7 +69,7 @@ def RunSteps(api): dotest_path = api.path.join(script_root, 'dotest.py') api.step('Clean slave build directory', - ['find', '.', '-delete'], + [find_cmd, '.', '-delete'], env=env) api.step('Download Image', ['scp', remote_path, |