Changeset 76527 in webkit

Timestamp:

Jan 24, 2011 9:37:45 AM (13 years ago)

Author:

tony@chromium.org

Message:

2011-01-24 Tony Chang <​tony@chromium.org>

Reviewed by James Robinson.

[chromium] turn off gyp circular dependency checking and roll chromium deps
​https://bugs.webkit.org/show_bug.cgi?id=52935

• DEPS:
• gyp_webkit: Turn off gyp circular dependency checking on Linux

and Win since we don't do these checks in gyp_chromium. It's
just making it harder for us to roll DEPS and have something
explode.

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-01-24  Tony Chang  <tony@chromium.org>
+
+        Reviewed by James Robinson.
+
+        [chromium] turn off gyp circular dependency checking and roll chromium deps
+        https://bugs.webkit.org/show_bug.cgi?id=52935
+
+        * DEPS:
+        * gyp_webkit: Turn off gyp circular dependency checking on Linux
+            and Win since we don't do these checks in gyp_chromium.  It's
+            just making it harder for us to roll DEPS and have something
+            explode.
+
 2011-01-24  Satish Sampath  <satish@chromium.org>
 

trunk/Source/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '71969'
+  'chromium_rev': '72181'
 }
 
@@ -57 +57 @@
   'skia':
     Var('chromium_svn')+'/skia@'+Var('chromium_rev'),
+  'third_party/skia/gpu':
+    From('chromium_deps', 'src/third_party/skia/gpu'),
   'third_party/skia/src':
     From('chromium_deps', 'src/third_party/skia/src'),

trunk/Source/WebKit/chromium/gyp_webkit

@@ -77 +77 @@
   args.extend(['-I' + i for i in additional_include_files(args)])
 
+  # There shouldn't be a circular dependency relationship between .gyp files,
+  # but in Chromium's .gyp files, on non-Mac platforms, circular relationships
+  # currently exist.  The check for circular dependencies is currently
+  # bypassed on other platforms, but is left enabled on the Mac, where a
+  # violation of the rule causes Xcode to misbehave badly.
+  # http://crbug.com/35878.
+  if sys.platform not in ('darwin',):
+    args.append('--no-circular-check')
+
   # On linux, we want gyp to output a makefile (default is scons).
   if sys.platform == 'linux2':