Drop libjingle/source/talk directory from DEPS.

tools/roll_webrtc.py

Index: tools/roll_webrtc.py
diff --git a/tools/roll_webrtc.py b/tools/roll_webrtc.py
index 5fb661c8b0aa8c1628be792e2f02d2a3118707f3..ad4c40e6ce89d3010eb48a6aac862a80ab2dce6a 100755
--- a/tools/roll_webrtc.py
+++ b/tools/roll_webrtc.py
@@ -36,8 +36,6 @@ TRYJOB_STATUS_SLEEP_SECONDS = 30
 # Use a shell for subcommands on Windows to get a PATH search.
 IS_WIN = sys.platform.startswith('win')
 WEBRTC_PATH = os.path.join('third_party', 'webrtc')
-LIBJINGLE_PATH = os.path.join('third_party', 'libjingle', 'source', 'talk')
-LIBJINGLE_README = os.path.join('third_party', 'libjingle', 'README.chromium')
 # Run these CQ trybots in addition to the default ones in infra/config/cq.cfg.
 EXTRA_TRYBOTS = ('tryserver.chromium.linux:linux_chromium_archive_rel_ng;'
                  'tryserver.chromium.mac:mac_chromium_archive_rel_ng')
@@ -155,8 +153,7 @@ def _PrintTrybotsStatus(tryjob_results):
     print '%s: %s' % (status, ','.join(sorted(name_list)))
 
 
-def _GenerateCLDescriptionCommand(webrtc_current, libjingle_current,
-                                  webrtc_new, libjingle_new):
+def _GenerateCLDescriptionCommand(webrtc_current, webrtc_new):
   delim = ''
   webrtc_str = ''
   def GetChangeLogURL(git_repo_url, current_hash, new_hash):
@@ -169,23 +166,10 @@ def _GenerateCLDescriptionCommand(webrtc_current, libjingle_current,
                                            webrtc_current.git_commit,
                                            webrtc_new.git_commit)
 
-  libjingle_str = ''
-  if libjingle_current.git_commit != libjingle_new.git_commit:
-    if webrtc_str:
-      delim += ', '
-    libjingle_str = 'Libjingle %s:%s' % (libjingle_current.commit_position,
-                                         libjingle_new.commit_position)
-    libjingle_changelog_url = GetChangeLogURL(libjingle_current.git_repo_url,
-                                              libjingle_current.git_commit,
-                                              libjingle_new.git_commit)
-
-  description = [ '-m', 'Roll ' + webrtc_str + delim + libjingle_str ]
+  description = [ '-m', 'Roll ' + webrtc_str ]
   if webrtc_str:

[kjellander_chromium, 2016/05/13 09:47:17]

You can remove line 183 too after removing the check at line 165.

     description.extend(['-m', webrtc_str])

[kjellander_chromium, 2016/05/13 09:47:17]

I suggest dropping adding this to the description. It's already in the title of
the CL so this is just repeating the same thing (see
https://codereview.chromium.org/1920743002/ for an example CL).

     description.extend(['-m', 'Changes: %s' % webrtc_changelog_url])
-  if libjingle_str:
-    description.extend(['-m', libjingle_str])
-    description.extend(['-m', 'Changes: %s' % libjingle_changelog_url])
   description.extend(['-m', 'TBR='])
   description.extend(['-m', 'CQ_EXTRA_TRYBOTS=%s' % EXTRA_TRYBOTS])
   return description
@@ -303,26 +287,22 @@ class AutoRoller(object):
     deps_filename = os.path.join(self._chromium_src, 'DEPS')
     deps = _ParseDepsFile(deps_filename)
     webrtc_current = self._GetDepsCommitInfo(deps, WEBRTC_PATH)
-    libjingle_current = self._GetDepsCommitInfo(deps, LIBJINGLE_PATH)
 
     # Find ToT revisions.
     webrtc_latest = self._GetCommitInfo(WEBRTC_PATH)
-    libjingle_latest = self._GetCommitInfo(LIBJINGLE_PATH)
 
     if IS_WIN:
       # Make sure the roll script doesn't use Windows line endings.
       self._RunCommand(['git', 'config', 'core.autocrlf', 'true'])
 
     self._UpdateDep(deps_filename, WEBRTC_PATH, webrtc_latest)
-    self._UpdateDep(deps_filename, LIBJINGLE_PATH, libjingle_latest)
 
     if self._IsTreeClean():
-      print 'The latest revision is already rolled for WebRTC and libjingle.'
+      print 'The latest revision is already rolled for WebRTC.'
       self._DeleteRollBranch()
     else:
-      self._UpdateReadmeFile(LIBJINGLE_README, libjingle_latest.commit_position)
       description = _GenerateCLDescriptionCommand(
-        webrtc_current, libjingle_current, webrtc_latest, libjingle_latest)
+        webrtc_current, webrtc_latest)
       logging.debug('Committing changes locally.')
       self._RunCommand(['git', 'add', '--update', '.'])
       self._RunCommand(['git', 'commit'] + description)
@@ -401,7 +381,7 @@ class AutoRoller(object):
 
 def main():
   parser = argparse.ArgumentParser(
-      description='Find webrtc and libjingle revisions for roll.')
+      description='Find webrtc revisions for roll.')
   parser.add_argument('--abort',
     help=('Aborts a previously prepared roll. '
           'Closes any associated issues and deletes the roll branches'),