2010-11-30 James Robinson <jamesr@chromium.org>
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Nov 2010 22:30:09 +0000 (22:30 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Nov 2010 22:30:09 +0000 (22:30 +0000)
        Reviewed by Dimitri Glazkov.

        [chromium] Update yasm entry in DEPS to match downstream
        https://bugs.webkit.org/show_bug.cgi?id=50274

        http://src.chromium.org/viewvc/chrome?view=rev&revision=67540 changed the downstream DEPS rule
        for yasm to pull unconditionally rather than pulling in each deps_os.  This changes the WebKit
        chromium DEPS to match.

        * DEPS:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@72965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/chromium/ChangeLog
WebKit/chromium/DEPS

index 3dddd80..cc5ab92 100644 (file)
@@ -1,3 +1,16 @@
+2010-11-30  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [chromium] Update yasm entry in DEPS to match downstream
+        https://bugs.webkit.org/show_bug.cgi?id=50274
+
+        http://src.chromium.org/viewvc/chrome?view=rev&revision=67540 changed the downstream DEPS rule
+        for yasm to pull unconditionally rather than pulling in each deps_os.  This changes the WebKit
+        chromium DEPS to match.
+
+        * DEPS:
+
 2010-11-29  Vangelis Kokkevis  <vangelis@chromium.org>
 
         Reviewed by Simon Fraser.
 2010-11-29  Vangelis Kokkevis  <vangelis@chromium.org>
 
         Reviewed by Simon Fraser.
index 2422b47..aca99b2 100644 (file)
@@ -109,12 +109,14 @@ deps = {
     Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'),
 
   # other third party
     Var('chromium_svn')+'/tools/generate_stubs@'+Var('chromium_rev'),
 
   # other third party
-  'third_party':
-    Var('chromium_svn')+'/third_party@'+Var('chromium_rev'),
   'third_party/icu':
     From('chromium_deps', 'src/third_party/icu'),
   'third_party/ots':
     From('chromium_deps', 'src/third_party/ots'),
   'third_party/icu':
     From('chromium_deps', 'src/third_party/icu'),
   'third_party/ots':
     From('chromium_deps', 'src/third_party/ots'),
+  'third_party/yasm/source/patched-yasm':
+    From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
+  'third_party':
+    Var('chromium_svn')+'/third_party@'+Var('chromium_rev'),
 }
 
 deps_os = {
 }
 
 deps_os = {
@@ -129,9 +131,6 @@ deps_os = {
       From('chromium_deps', 'src/third_party/nss'),
   },
   'mac': {
       From('chromium_deps', 'src/third_party/nss'),
   },
   'mac': {
-    # needed by ffmpeg
-    'third_party/yasm/source/patched-yasm':
-      From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
     'third_party/nss':
       From('chromium_deps', 'src/third_party/nss'),
   },
     'third_party/nss':
       From('chromium_deps', 'src/third_party/nss'),
   },
@@ -139,8 +138,6 @@ deps_os = {
     # Linux, actually.
     'tools/xdisplaycheck':
       Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'),
     # Linux, actually.
     'tools/xdisplaycheck':
       Var('chromium_svn')+'/tools/xdisplaycheck@'+Var('chromium_rev'),
-    'third_party/yasm/source/patched-yasm':
-      From('chromium_deps', 'src/third_party/yasm/source/patched-yasm'),
     'third_party/openssl':
       From('chromium_deps', 'src/third_party/openssl'),
   },
     'third_party/openssl':
       From('chromium_deps', 'src/third_party/openssl'),
   },