Changeset 101011 in webkit

Timestamp:

Nov 22, 2011 10:30:20 AM (12 years ago)

Author:

dpranke@chromium.org

Message:

Roll Chromium DEPS to r110960 and set the disable_nacl flag.
​https://bugs.webkit.org/show_bug.cgi?id=72911

Unreviewed, build fix.

ppapi starts to depend on the NaCl gyp files as of r109739, so
we need to pass disable_nacl when running gyp to avoid pulling
in too much of NaCl.

• DEPS:
• gyp_webkit:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• DEPS (modified) (2 diffs)
• gyp_webkit (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-22  Dirk Pranke  <dpranke@chromium.org>
+
+        Roll Chromium DEPS to r110960 and set the disable_nacl flag.
+        https://bugs.webkit.org/show_bug.cgi?id=72911
+
+        Unreviewed, build fix.
+
+        ppapi starts to depend on the NaCl gyp files as of r109739, so
+        we need to pass disable_nacl when running gyp to avoid pulling
+        in too much of NaCl.
+
+        * DEPS:
+        * gyp_webkit:
+
 2011-11-22  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '109696'
+  'chromium_rev': '110359',
+  'nacl_svn': 'http://src.chromium.org/native_client/trunk',
+  'nacl_rev': '7169',
 }
 
@@ -94 +96 @@
   'media':
     Var('chromium_svn')+'/media@'+Var('chromium_rev'),
+  'native_client/build':
+    Var('nacl_svn')+'/src/native_client/build@'+Var('nacl_rev'),
   'printing':
     Var('chromium_svn')+'/printing@'+Var('chromium_rev'),

trunk/Source/WebKit/chromium/gyp_webkit

@@ -120 +120 @@
                '-Dv8_use_snapshot=false',
                '-Dmsvs_use_common_release=0',
+               '-Ddisable_nacl=1',
 
                # WebKit doesn't use the chromium style checker.