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

Side by Side Diff: chrome/chrome_renderer.gypi

Issue 551070: Revert 36541 (which went in without any commit log by some black magic). ... (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',
20 '../third_party/icu/icu.gyp:icui18n', 19 '../third_party/icu/icu.gyp:icui18n',
21 '../third_party/icu/icu.gyp:icuuc', 20 '../third_party/icu/icu.gyp:icuuc',
22 '../third_party/npapi/npapi.gyp:npapi', 21 '../third_party/npapi/npapi.gyp:npapi',
23 # TODO(yaar): Should only stop depending on webcore and depend 22 # TODO(yaar): Should only stop depending on webcore and depend
24 # only on webkit. 23 # only on webkit.
25 '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', 24 '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
26 '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', 25 '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
27 '../webkit/webkit.gyp:glue', 26 '../webkit/webkit.gyp:glue',
28 ], 27 ],
29 'include_dirs': [ 28 'include_dirs': [
30 '..', 29 '..',
31 '../third_party/cld',
32 ], 30 ],
33 'defines': [ 31 'defines': [
34 '<@(nacl_defines)', 32 '<@(nacl_defines)',
35 ], 33 ],
36 'sources': [ 34 'sources': [
37 # TODO(jrg): to link ipc_tests, these files need to be in renderer.a. 35 # TODO(jrg): to link ipc_tests, these files need to be in renderer.a.
38 # But app/ is the wrong directory for them. 36 # But app/ is the wrong directory for them.
39 # Better is to remove the dep of *_tests on renderer, but in the 37 # Better is to remove the dep of *_tests on renderer, but in the
40 # short term I'd like the build to work. 38 # short term I'd like the build to work.
41 'renderer/automation/dom_automation_controller.cc', 39 'renderer/automation/dom_automation_controller.cc',
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 # Linux-specific rules. 161 # Linux-specific rules.
164 ['OS=="linux"', { 162 ['OS=="linux"', {
165 'dependencies': [ 163 'dependencies': [
166 '../build/linux/system.gyp:gtk', 164 '../build/linux/system.gyp:gtk',
167 '../sandbox/sandbox.gyp:sandbox', 165 '../sandbox/sandbox.gyp:sandbox',
168 ], 166 ],
169 }], 167 }],
170 # Windows-specific rules. 168 # Windows-specific rules.
171 ['OS=="win"', { 169 ['OS=="win"', {
172 'include_dirs': [ 170 'include_dirs': [
171 '../third_party/cld',
173 'third_party/wtl/include', 172 'third_party/wtl/include',
174 ], 173 ],
174 'dependencies': [
175 '../third_party/cld/cld.gyp:cld',
176 ],
175 'conditions': [ 177 'conditions': [
176 ['win_use_allocator_shim==1', { 178 ['win_use_allocator_shim==1', {
177 'dependencies': [ 179 'dependencies': [
178 '<(allocator_target)', 180 '<(allocator_target)',
179 ], 181 ],
180 'export_dependent_settings': [ 182 'export_dependent_settings': [
181 '<(allocator_target)', 183 '<(allocator_target)',
182 ], 184 ],
183 }], 185 }],
184 ], 186 ],
185 }], 187 }],
186 ['OS=="win" or (OS=="linux" and target_arch!="arm")', { 188 ['OS=="win" or (OS=="linux" and target_arch!="arm")', {
187 'sources': [ 189 'sources': [
188 'renderer/command_buffer_proxy.cc', 190 'renderer/command_buffer_proxy.cc',
189 'renderer/command_buffer_proxy.h', 191 'renderer/command_buffer_proxy.h',
190 ], 192 ],
191 }], 193 }],
192 ], 194 ],
193 }, 195 },
194 ], 196 ],
195 } 197 }
196 198
197 # Local Variables: 199 # Local Variables:
198 # tab-width:2 200 # tab-width:2
199 # indent-tabs-mode:nil 201 # indent-tabs-mode:nil
200 # End: 202 # End:
201 # vim: set expandtab tabstop=2 shiftwidth=2: 203 # 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