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

Side by Side Diff: chrome/chrome_renderer.gypi

Issue 549091: Reland r36541 (which went in without any commit log by some magic). Was rever... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'renderer', 8 'target_name': 'renderer',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D', 10 'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D',
11 'dependencies': [ 11 'dependencies': [
12 'common', 12 'common',
13 'plugin', 13 'plugin',
14 'chrome_resources', 14 'chrome_resources',
15 'chrome_strings', 15 'chrome_strings',
16 '../printing/printing.gyp:printing', 16 '../printing/printing.gyp:printing',
17 '../skia/skia.gyp:skia', 17 '../skia/skia.gyp:skia',
18 '../third_party/hunspell/hunspell.gyp:hunspell', 18 '../third_party/hunspell/hunspell.gyp:hunspell',
19 '../third_party/cld/cld.gyp:cld',
19 '../third_party/icu/icu.gyp:icui18n', 20 '../third_party/icu/icu.gyp:icui18n',
20 '../third_party/icu/icu.gyp:icuuc', 21 '../third_party/icu/icu.gyp:icuuc',
21 '../third_party/npapi/npapi.gyp:npapi', 22 '../third_party/npapi/npapi.gyp:npapi',
22 # TODO(yaar): Should only stop depending on webcore and depend 23 # TODO(yaar): Should only stop depending on webcore and depend
23 # only on webkit. 24 # only on webkit.
24 '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', 25 '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
25 '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', 26 '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
26 '../webkit/webkit.gyp:glue', 27 '../webkit/webkit.gyp:glue',
27 ], 28 ],
28 'include_dirs': [ 29 'include_dirs': [
29 '..', 30 '..',
31 '../third_party/cld',
30 ], 32 ],
31 'defines': [ 33 'defines': [
32 '<@(nacl_defines)', 34 '<@(nacl_defines)',
33 ], 35 ],
34 'sources': [ 36 'sources': [
35 # TODO(jrg): to link ipc_tests, these files need to be in renderer.a. 37 # TODO(jrg): to link ipc_tests, these files need to be in renderer.a.
36 # But app/ is the wrong directory for them. 38 # But app/ is the wrong directory for them.
37 # Better is to remove the dep of *_tests on renderer, but in the 39 # Better is to remove the dep of *_tests on renderer, but in the
38 # short term I'd like the build to work. 40 # short term I'd like the build to work.
39 'renderer/automation/dom_automation_controller.cc', 41 'renderer/automation/dom_automation_controller.cc',
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 # Linux-specific rules. 163 # Linux-specific rules.
162 ['OS=="linux"', { 164 ['OS=="linux"', {
163 'dependencies': [ 165 'dependencies': [
164 '../build/linux/system.gyp:gtk', 166 '../build/linux/system.gyp:gtk',
165 '../sandbox/sandbox.gyp:sandbox', 167 '../sandbox/sandbox.gyp:sandbox',
166 ], 168 ],
167 }], 169 }],
168 # Windows-specific rules. 170 # Windows-specific rules.
169 ['OS=="win"', { 171 ['OS=="win"', {
170 'include_dirs': [ 172 'include_dirs': [
171 '../third_party/cld',
172 'third_party/wtl/include', 173 'third_party/wtl/include',
173 ], 174 ],
174 'dependencies': [
175 '../third_party/cld/cld.gyp:cld',
176 ],
177 'conditions': [ 175 'conditions': [
178 ['win_use_allocator_shim==1', { 176 ['win_use_allocator_shim==1', {
179 'dependencies': [ 177 'dependencies': [
180 '<(allocator_target)', 178 '<(allocator_target)',
181 ], 179 ],
182 'export_dependent_settings': [ 180 'export_dependent_settings': [
183 '<(allocator_target)', 181 '<(allocator_target)',
184 ], 182 ],
185 }], 183 }],
186 ], 184 ],
187 }], 185 }],
188 ['OS=="win" or (OS=="linux" and target_arch!="arm")', { 186 ['OS=="win" or (OS=="linux" and target_arch!="arm")', {
189 'sources': [ 187 'sources': [
190 'renderer/command_buffer_proxy.cc', 188 'renderer/command_buffer_proxy.cc',
191 'renderer/command_buffer_proxy.h', 189 'renderer/command_buffer_proxy.h',
192 ], 190 ],
193 }], 191 }],
194 ], 192 ],
195 }, 193 },
196 ], 194 ],
197 } 195 }
198 196
199 # Local Variables: 197 # Local Variables:
200 # tab-width:2 198 # tab-width:2
201 # indent-tabs-mode:nil 199 # indent-tabs-mode:nil
202 # End: 200 # End:
203 # vim: set expandtab tabstop=2 shiftwidth=2: 201 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698