| OLD | NEW |
| 1 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """This is the Linux implementation of the layout_package.platform_utils | 5 """This is the Linux implementation of the layout_package.platform_utils |
| 6 package. This file should only be imported by that package.""" | 6 package. This file should only be imported by that package.""" |
| 7 | 7 |
| 8 import path_utils | 8 import path_utils |
| 9 import subprocess | 9 import subprocess |
| 10 import sys | 10 import sys |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 # | 130 # |
| 131 | 131 |
| 132 def _FindBinary(target, binary): | 132 def _FindBinary(target, binary): |
| 133 """On Windows, we look for binaries that we compile in potentially | 133 """On Windows, we look for binaries that we compile in potentially |
| 134 two places: src/webkit/$target (preferably, which we get if we | 134 two places: src/webkit/$target (preferably, which we get if we |
| 135 built using webkit.gyp), or src/chrome/$target (if compiled some other | 135 built using webkit.gyp), or src/chrome/$target (if compiled some other |
| 136 way).""" | 136 way).""" |
| 137 try: | 137 try: |
| 138 return path_utils.PathFromBase('webkit', target, binary) | 138 return path_utils.PathFromBase('webkit', target, binary) |
| 139 except path_utils.PathNotFound: | 139 except path_utils.PathNotFound: |
| 140 return path_utils.PathFromBase('chrome', target, binary) | 140 try: |
| 141 return path_utils.PathFromBase('chrome', target, binary) |
| 142 except path_utils.PathNotFound: |
| 143 return path_utils.PathFromBase('build', target, binary) |
| OLD | NEW |