Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: webkit/appcache/webkit_appcache.gypi

Issue 8667009: Work around a bug in gyp triggered by webkit_appcache.gypi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: refactor again so that the mac build doesn't pull in the webkit dependency Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 'webkit_appcache.gypi', 79 'webkit_appcache.gypi',
80 ], 80 ],
81 'conditions': [ 81 'conditions': [
82 [# TODO(dpranke): Remove once the circular dependencies in 82 [# TODO(dpranke): Remove once the circular dependencies in
83 # WebKit.gyp are fixed on the mac. 83 # WebKit.gyp are fixed on the mac.
84 # See https://bugs.webkit.org/show_bug.cgi?id=68463 84 # See https://bugs.webkit.org/show_bug.cgi?id=68463
85 'OS=="mac"', { 85 'OS=="mac"', {
86 'type': 'static_library', 86 'type': 'static_library',
87 }, { 87 }, {
88 'type': '<(component)', 88 'type': '<(component)',
89 'dependencies': [
90 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
91 ],
92 }], 89 }],
93 ['inside_chromium_build==0', { 90 ['inside_chromium_build==0', {
94 'dependencies': [ 91 'dependencies': [
95 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 92 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
96 ], 93 ],
97 }], 94 }],
95 [# TODO(dpranke): Figure out why this doesn't work outside of
96 # a webkit build - this seems to be a bug in the make gyp generator.
97 'OS!="mac" and inside_chromium_build==1', {
98 'dependencies': [
99 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
100 ],
101 }],
98 ], 102 ],
99 }, 103 },
100 ], 104 ],
101 } 105 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698