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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 10377155: Move ui/gfx/resources to ui/base/native_theme/resources Step2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: keep gfx_resources.pak for DumpRenderTree Created 8 years, 7 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 # their various targets (net.gyp:net_resources, etc.), 95 # their various targets (net.gyp:net_resources, etc.),
96 # but that causes errors in other targets when 96 # but that causes errors in other targets when
97 # resulting .res files get referenced multiple times. 97 # resulting .res files get referenced multiple times.
98 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 98 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
99 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 99 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
100 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 100 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
101 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 101 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
102 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 102 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
103 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 103 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
104 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 104 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
105 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 105 '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resourc es.rc',
106 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 106 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
107 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resource s_standard.rc', 107 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resource s_standard.rc',
108 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 108 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
109 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 109 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
110 110
111 # TODO(sgk): left-over from pre-gyp build, figure out 111 # TODO(sgk): left-over from pre-gyp build, figure out
112 # if we still need them and/or how to update to gyp. 112 # if we still need them and/or how to update to gyp.
113 #'app/check_dependents.bat', 113 #'app/check_dependents.bat',
114 #'app/chrome.dll.deps', 114 #'app/chrome.dll.deps',
115 ], 115 ],
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 ], 540 ],
541 }], 541 }],
542 ], # conditions 542 ], # conditions
543 }], # OS=="mac" 543 }], # OS=="mac"
544 ], # conditions 544 ], # conditions
545 }, # target chrome_dll 545 }, # target chrome_dll
546 ], # targets 546 ], # targets
547 }], # OS=="mac" or OS=="win" 547 }], # OS=="mac" or OS=="win"
548 ], 548 ],
549 } 549 }
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | chrome/chrome_repack_chrome.gypi » ('j') | ui/views/views.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698