| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'conditions': [ | 7 'conditions': [ |
| 8 ['inside_chromium_build==0', { | 8 ['inside_chromium_build==0', { |
| 9 'webkit_src_dir': '../../../../..', | 9 'webkit_src_dir': '../../../../..', |
| 10 },{ | 10 },{ |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', | 47 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', |
| 48 ], | 48 ], |
| 49 }], | 49 }], |
| 50 # TODO(dpranke): Figure out why this works at all and/or get | 50 # TODO(dpranke): Figure out why this works at all and/or get |
| 51 # rid of it. | 51 # rid of it. |
| 52 ['OS=="win" and component == "shared_library"', { | 52 ['OS=="win" and component == "shared_library"', { |
| 53 'dependencies': [ | 53 'dependencies': [ |
| 54 '<(DEPTH)/webkit/support/webkit_support.gyp:glue', | 54 '<(DEPTH)/webkit/support/webkit_support.gyp:glue', |
| 55 ], | 55 ], |
| 56 }], | 56 }], |
| 57 [# TODO(dpranke): Remove once the circular dependencies in | |
| 58 # WebKit.gyp are fixed on the mac. | |
| 59 # See https://bugs.webkit.org/show_bug.cgi?id=68463 | |
| 60 'OS!="mac"', { | |
| 61 'dependencies': [ | |
| 62 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', | |
| 63 ], | |
| 64 }], | |
| 65 ], | 57 ], |
| 66 }, | 58 }, |
| 67 ], | 59 ], |
| 68 } | 60 } |
| OLD | NEW |