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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 486573002: Move webkit resources over to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm the build files from webkit/glue/resources Created 6 years, 4 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 'chrome_user32_delay_imports', 103 'chrome_user32_delay_imports',
104 ], 104 ],
105 },], 105 },],
106 ['OS=="win"', { 106 ['OS=="win"', {
107 'product_name': 'chrome', 107 'product_name': 'chrome',
108 'dependencies': [ 108 'dependencies': [
109 # On Windows, link the dependencies (libraries) that make 109 # On Windows, link the dependencies (libraries) that make
110 # up actual Chromium functionality into this .dll. 110 # up actual Chromium functionality into this .dll.
111 'chrome_version_resources', 111 'chrome_version_resources',
112 '../chrome/chrome_resources.gyp:chrome_unscaled_resources', 112 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
113 '../content/app/resources/content_resources.gyp:content_resource s',
113 '../crypto/crypto.gyp:crypto', 114 '../crypto/crypto.gyp:crypto',
114 '../net/net.gyp:net_resources', 115 '../net/net.gyp:net_resources',
115 '../ui/views/views.gyp:views', 116 '../ui/views/views.gyp:views',
116 '../webkit/glue/resources/webkit_resources.gyp:webkit_resources' ,
117 ], 117 ],
118 'sources': [ 118 'sources': [
119 'app/chrome_command_ids.h', 119 'app/chrome_command_ids.h',
120 'app/chrome_dll.rc', 120 'app/chrome_dll.rc',
121 'app/chrome_dll_resource.h', 121 'app/chrome_dll_resource.h',
122 'app/chrome_main.cc', 122 'app/chrome_main.cc',
123 'app/chrome_main_delegate.cc', 123 'app/chrome_main_delegate.cc',
124 'app/chrome_main_delegate.h', 124 'app/chrome_main_delegate.h',
125 'app/delay_load_hook_win.cc', 125 'app/delay_load_hook_win.cc',
126 'app/delay_load_hook_win.h', 126 'app/delay_load_hook_win.h',
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 }, 371 },
372 }], 372 }],
373 ] 373 ]
374 }], 374 }],
375 ], 375 ],
376 }, # target chrome_child_dll 376 }, # target chrome_child_dll
377 ], 377 ],
378 }], 378 }],
379 ], 379 ],
380 } 380 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698