Changeset 102891 in webkit

Timestamp:

Dec 14, 2011 10:34:22 PM (12 years ago)

Author:

tony@chromium.org

Message:

[chromium] Remove redundant third_party entries from chromium DEPS
​https://bugs.webkit.org/show_bug.cgi?id=74472

Reviewed by Kenneth Russell.

Source/WebKit/chromium:

Removed redundant DEPS entries for third_party subdirectories
coming from chromium_svn, which were causing intermittent gclient
failures on the bots.

• DEPS:

Tools:

• Scripts/update-webkit-chromium: Temporarily keep unversioned trees.

Location:

trunk

Files:

• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/DEPS (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/update-webkit-chromium (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-12-14  Tony Chang  <tony@chromium.org>
+
+        [chromium] Remove redundant third_party entries from chromium DEPS
+        https://bugs.webkit.org/show_bug.cgi?id=74472
+
+        Reviewed by Kenneth Russell.
+
+        Removed redundant DEPS entries for third_party subdirectories
+        coming from chromium_svn, which were causing intermittent gclient
+        failures on the bots.
+
+        * DEPS:
+
 2011-12-14  Scott Graham  <scottmg@chromium.org>
 

trunk/Source/WebKit/chromium/DEPS

@@ -110 +110 @@
   'third_party/libjingle/source':
     From('chromium_deps', 'src/third_party/libjingle/source'),
-  'third_party/libwebp':
-    Var('chromium_svn')+'/third_party/libwebp@'+Var('chromium_rev'),
   'tools/grit':
     From('chromium_deps', 'src/tools/grit'),
@@ -159 +157 @@
   },
   'mac': {
-    'third_party/apple_apsl':
-      Var('chromium_svn')+'/third_party/apple_apsl@'+Var('chromium_rev'),
-    'third_party/apple_webkit':
-      Var('chromium_svn')+'/third_party/apple_webkit@'+Var('chromium_rev'),
     'third_party/nss':
       From('chromium_deps', 'src/third_party/nss'),

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-14  Tony Chang  <tony@chromium.org>
+
+        [chromium] Remove redundant third_party entries from chromium DEPS
+        https://bugs.webkit.org/show_bug.cgi?id=74472
+
+        Reviewed by Kenneth Russell.
+
+        * Scripts/update-webkit-chromium: Temporarily keep unversioned trees.
+
 2011-12-14  Kentaro Hara  <haraken@chromium.org>
 

trunk/Tools/Scripts/update-webkit-chromium

@@ -87 +87 @@
 # --reset could delete modified files if necessary to sync.
 push @gclientArgs, "--reset" if $force;
-push @gclientArgs, "--delete_unversioned_trees" if $force;
+# Temporarily keep unversioned trees so we don't delete third_party/libwebp.
+# See https://bugs.webkit.org/show_bug.cgi?id=74565 .
+#push @gclientArgs, "--delete_unversioned_trees" if $force;
 push @gclientArgs, "--deps=unix,android" if isChromiumAndroid();