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

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

Issue 9254040: remove build_webkit_exes_from_webkit_gyp flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: put back blob's dependency on webkit, fix indentation Created 8 years, 11 months 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 | « content/content.gyp ('k') | webkit/blob/webkit_blob.gypi » ('j') | 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 },{
11 'webkit_src_dir': '../../third_party/WebKit', 11 'webkit_src_dir': '../../third_party/WebKit',
12 }], 12 }],
13 ], 13 ],
14 }, 14 },
15 'targets': [ 15 'targets': [
16 { 16 {
17 'target_name': 'appcache', 17 'target_name': 'appcache',
18 'variables': { 'enable_wexit_time_destructors': 1, }, 18 'variables': { 'enable_wexit_time_destructors': 1, },
19 'type': '<(component)',
19 'defines': [ 20 'defines': [
20 'APPCACHE_IMPLEMENTATION', 21 'APPCACHE_IMPLEMENTATION',
21 ], 22 ],
22 'dependencies': [ 23 'dependencies': [
23 'quota', 24 'quota',
24 '<(DEPTH)/base/base.gyp:base_i18n', 25 '<(DEPTH)/base/base.gyp:base_i18n',
25 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 26 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
26 '<(DEPTH)/net/net.gyp:net', 27 '<(DEPTH)/net/net.gyp:net',
27 '<(DEPTH)/sql/sql.gyp:sql', 28 '<(DEPTH)/sql/sql.gyp:sql',
28 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 29 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
30 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
29 ], 31 ],
30 'sources': [ 32 'sources': [
31 # This list contains all .h and .cc in appcache except for test code. 33 # This list contains all .h and .cc in appcache except for test code.
32 'appcache.cc', 34 'appcache.cc',
33 'appcache.h', 35 'appcache.h',
34 'appcache_backend_impl.cc', 36 'appcache_backend_impl.cc',
35 'appcache_backend_impl.h', 37 'appcache_backend_impl.h',
36 'appcache_database.cc', 38 'appcache_database.cc',
37 'appcache_database.h', 39 'appcache_database.h',
38 'appcache_disk_cache.cc', 40 'appcache_disk_cache.cc',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 'appcache_url_request_job.h', 74 'appcache_url_request_job.h',
73 'manifest_parser.cc', 75 'manifest_parser.cc',
74 'manifest_parser.h', 76 'manifest_parser.h',
75 'view_appcache_internals_job.h', 77 'view_appcache_internals_job.h',
76 'view_appcache_internals_job.cc', 78 'view_appcache_internals_job.cc',
77 'web_application_cache_host_impl.cc', 79 'web_application_cache_host_impl.cc',
78 'web_application_cache_host_impl.h', 80 'web_application_cache_host_impl.h',
79 'webkit_appcache.gypi', 81 'webkit_appcache.gypi',
80 ], 82 ],
81 'conditions': [ 83 'conditions': [
82 [# TODO(dpranke): Remove once the circular dependencies in
83 # WebKit.gyp are fixed on the mac.
84 # See https://bugs.webkit.org/show_bug.cgi?id=68463
85 'OS=="mac"', {
86 'type': 'static_library',
87 }, {
88 'type': '<(component)',
89 }],
90 ['inside_chromium_build==0', { 84 ['inside_chromium_build==0', {
91 'dependencies': [ 85 'dependencies': [
92 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 86 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
93 ], 87 ],
94 }], 88 }],
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 # See http://code.google.com/p/chromium/issues/detail?id=105299 .
98 'OS!="mac" and inside_chromium_build==1', {
99 'dependencies': [
100 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
101 ],
102 }],
103 ], 89 ],
104 }, 90 },
105 ], 91 ],
106 } 92 }
OLDNEW
« no previous file with comments | « content/content.gyp ('k') | webkit/blob/webkit_blob.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698