2010-04-21 Kent Tamura <tkent@chromium.org>
authortkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Apr 2010 15:57:02 +0000 (15:57 +0000)
committertkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Apr 2010 15:57:02 +0000 (15:57 +0000)
        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:

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

WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

index eb6987e..daa1239 100644 (file)
@@ -1,3 +1,17 @@
+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>
 
         Reviewed by Darin Adler.
index 3834d98..82b8671 100644 (file)
                 # DumpRenderTree is being built outside of the full chromium project.
                 # 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',
             }],
         ],
     },
@@ -79,7 +81,7 @@
                 '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
                 '<(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': [
                 '.',