Changeset 57988 in webkit

Timestamp:

Apr 21, 2010 8:57:02 AM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-04-21 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

[DRT/Chromium] Make DRT compilable in Chromium tree
​https://bugs.webkit.org/show_bug.cgi?id=37923

We need to use different GYPs in a case of WebKit-only checkout
and a case of whole Chromium checkout because the relative paths
from webkit/ to WebKit/chromium/features.gypi are different in
these cases and we can't use 'conditions' for 'includes' in GYPs.

• DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-21  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [DRT/Chromium] Make DRT compilable in Chromium tree
+        https://bugs.webkit.org/show_bug.cgi?id=37923
+
+        We need to use different GYPs in a case of WebKit-only checkout
+        and a case of whole Chromium checkout because the relative paths
+        from webkit/ to WebKit/chromium/features.gypi are different in
+        these cases and we can't use 'conditions' for 'includes' in GYPs.
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
 2010-04-21  Jakub Wieczorek  <jwieczorek@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

@@ -43 +43 @@
                 # e.g. via build-dumprendertree --chromium
                 'chromium_src_dir': '<(webkit_api_dir)',
+                'webkit_support_gyp': '<(webkit_api_dir)/webkit/support/webkit_support.gyp',
             },{
                 # WebKit is checked out in src/chromium/third_party/WebKit
                 'chromium_src_dir': '<(webkit_top)/../..',
+                'webkit_support_gyp': '<(webkit_top)/../../webkit/webkit.gyp',
             }],
         ],
@@ -80 +82 @@
                 '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
                 '<(chromium_src_dir)/skia/skia.gyp:skia',
-                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
+                '<(webkit_support_gyp):webkit_support',
             ],
             'include_dirs': [