| Index: tools-webrtc/autoroller/roll_deps.py
|
| diff --git a/tools-webrtc/autoroller/roll_deps.py b/tools-webrtc/autoroller/roll_deps.py
|
| index 1bfcaee701c12139048c658847e859bd02b16a1d..f3287a8608c23e17daadb8a74cfc03d284303167 100755
|
| --- a/tools-webrtc/autoroller/roll_deps.py
|
| +++ b/tools-webrtc/autoroller/roll_deps.py
|
| @@ -23,7 +23,7 @@ import urllib
|
| # Skip these dependencies (list without solution name prefix).
|
| DONT_AUTOROLL_THESE = [
|
| 'src/third_party/gflags/src',
|
| - 'src/third_party/winsdk_samples/src',
|
| + 'src/third_party/winsdk_samples',
|
| ]
|
|
|
| WEBRTC_URL = 'https://chromium.googlesource.com/external/webrtc'
|
| @@ -40,7 +40,6 @@ SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
| CHECKOUT_SRC_DIR = os.path.realpath(os.path.join(SCRIPT_DIR, os.pardir,
|
| os.pardir))
|
| CHECKOUT_ROOT_DIR = os.path.realpath(os.path.join(CHECKOUT_SRC_DIR, os.pardir))
|
| -CHROMIUM_CHECKOUT_SRC_DIR = os.path.join(CHECKOUT_SRC_DIR, 'chromium', 'src')
|
|
|
| sys.path.append(CHECKOUT_SRC_DIR)
|
| import setup_links
|
| @@ -51,8 +50,8 @@ find_depot_tools.add_depot_tools_to_path()
|
| from gclient import GClientKeywords
|
|
|
| CLANG_UPDATE_SCRIPT_URL_PATH = 'tools/clang/scripts/update.py'
|
| -CLANG_UPDATE_SCRIPT_LOCAL_PATH = os.path.join('tools', 'clang', 'scripts',
|
| - 'update.py')
|
| +CLANG_UPDATE_SCRIPT_LOCAL_PATH = os.path.join(CHECKOUT_SRC_DIR, 'tools',
|
| + 'clang', 'scripts', 'update.py')
|
|
|
| DepsEntry = collections.namedtuple('DepsEntry', 'path url revision')
|
| ChangedDep = collections.namedtuple('ChangedDep',
|
| @@ -297,9 +296,7 @@ def CalculateChangedClang(new_cr_rev):
|
| return match.group(1)
|
| raise RollError('Could not parse Clang revision!')
|
|
|
| - chromium_src_path = os.path.join(CHROMIUM_CHECKOUT_SRC_DIR,
|
| - CLANG_UPDATE_SCRIPT_LOCAL_PATH)
|
| - with open(chromium_src_path, 'rb') as f:
|
| + with open(CLANG_UPDATE_SCRIPT_LOCAL_PATH, 'rb') as f:
|
| current_lines = f.readlines()
|
| current_rev = GetClangRev(current_lines)
|
|
|
| @@ -366,6 +363,15 @@ def UpdateDepsFile(deps_filename, old_cr_revision, new_cr_revision,
|
|
|
| # Update each individual DEPS entry.
|
| for dep in changed_deps:
|
| + local_dep_dir = os.path.join(CHECKOUT_ROOT_DIR, dep.path)
|
| + if not os.path.isdir(local_dep_dir):
|
| + raise RollError(
|
| + 'Cannot find local directory %s. Either run\n'
|
| + 'gclient sync --deps=all\n'
|
| + 'or make sure the .gclient file for your solution contains all '
|
| + 'platforms in the target_os list, i.e.\n'
|
| + 'target_os = ["android", "unix", "mac", "ios", "win"];\n'
|
| + 'Then run "gclient sync" again.' % local_dep_dir)
|
| _, stderr = _RunCommand(
|
| ['roll-dep-svn', '--no-verify-revision', dep.path, dep.new_rev],
|
| working_dir=CHECKOUT_SRC_DIR, ignore_exit_code=True)
|
|
|