Title: [102891] trunk
- Revision
- 102891
- Author
- t...@chromium.org
- Date
- 2011-12-14 22:34:22 -0800 (Wed, 14 Dec 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (102890 => 102891)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-15 06:32:27 UTC (rev 102890)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-15 06:34:22 UTC (rev 102891)
@@ -1,3 +1,16 @@
+2011-12-14 Tony Chang <t...@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 <scot...@chromium.org>
Increase maximum number of gamepad buttons in Chromium port interface
Modified: trunk/Source/WebKit/chromium/DEPS (102890 => 102891)
--- trunk/Source/WebKit/chromium/DEPS 2011-12-15 06:32:27 UTC (rev 102890)
+++ trunk/Source/WebKit/chromium/DEPS 2011-12-15 06:34:22 UTC (rev 102891)
@@ -109,8 +109,6 @@
From('chromium_deps', 'src/third_party/ffmpeg'),
'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'),
'tools/gritsettings':
@@ -158,10 +156,6 @@
From('chromium_deps', 'src/third_party/yasm/binaries'),
},
'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'),
},
Modified: trunk/Tools/ChangeLog (102890 => 102891)
--- trunk/Tools/ChangeLog 2011-12-15 06:32:27 UTC (rev 102890)
+++ trunk/Tools/ChangeLog 2011-12-15 06:34:22 UTC (rev 102891)
@@ -1,3 +1,12 @@
+2011-12-14 Tony Chang <t...@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 <hara...@chromium.org>
[Refactoring] In prepare-ChangeLog, replace $isGit and $isSVN with
Modified: trunk/Tools/Scripts/update-webkit-chromium (102890 => 102891)
--- trunk/Tools/Scripts/update-webkit-chromium 2011-12-15 06:32:27 UTC (rev 102890)
+++ trunk/Tools/Scripts/update-webkit-chromium 2011-12-15 06:34:22 UTC (rev 102891)
@@ -86,7 +86,9 @@
push @gclientArgs, "--force" if $force;
# --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();
my $cmd = join(" ",@gclientArgs);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
