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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 792005: Move devtool resources from webkit_resources.grd to renderer_resources.grd. (Closed)
Patch Set: split Created 10 years, 9 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
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/renderer/devtools_agent.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'browser_tests_sources_views_specific': [ 7 'browser_tests_sources_views_specific': [
8 'browser/extensions/browser_action_test_util_views.cc', 8 'browser/extensions/browser_action_test_util_views.cc',
9 'browser/views/browser_actions_container_unittest.cc', 9 'browser/views/browser_actions_container_unittest.cc',
10 'browser/views/find_bar_host_browsertest.cc', 10 'browser/views/find_bar_host_browsertest.cc',
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 # automatically from direct_dependent_settings in 1064 # automatically from direct_dependent_settings in
1065 # their various targets (net.gyp:net_resources, etc.), 1065 # their various targets (net.gyp:net_resources, etc.),
1066 # but that causes errors in other targets when 1066 # but that causes errors in other targets when
1067 # resulting .res files get referenced multiple times. 1067 # resulting .res files get referenced multiple times.
1068 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 1068 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
1069 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 1069 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1070 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 1070 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1071 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 1071 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
1072 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 1072 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
1073 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 1073 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1074 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.rc',
1074 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 1075 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
1075 ], 1076 ],
1076 'sources!': [ 1077 'sources!': [
1077 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', 1078 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
1078 'common/net/url_util_unittest.cc', 1079 'common/net/url_util_unittest.cc',
1079 ], 1080 ],
1080 'link_settings': { 1081 'link_settings': {
1081 'libraries': [ 1082 'libraries': [
1082 '-lcomsupp.lib', 1083 '-lcomsupp.lib',
1083 '-loleacc.lib', 1084 '-loleacc.lib',
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 'app/chrome_dll.rc', 1229 'app/chrome_dll.rc',
1229 'app/chrome_dll_resource.h', 1230 'app/chrome_dll_resource.h',
1230 'app/chrome_dll_version.rc.version', 1231 'app/chrome_dll_version.rc.version',
1231 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 1232 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
1232 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 1233 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1233 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 1234 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ',
1234 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 1235 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1235 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 1236 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1236 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 1237 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
1237 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 1238 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
1239 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.rc',
1238 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 1240 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
1239 '<@(browser_tests_sources_win_specific)', 1241 '<@(browser_tests_sources_win_specific)',
1240 '<@(browser_tests_sources_views_specific)' 1242 '<@(browser_tests_sources_views_specific)'
1241 ], 1243 ],
1242 'include_dirs': [ 1244 'include_dirs': [
1243 '<(DEPTH)/third_party/wtl/include', 1245 '<(DEPTH)/third_party/wtl/include',
1244 ], 1246 ],
1245 'dependencies': [ 1247 'dependencies': [
1246 'chrome_dll_version', 1248 'chrome_dll_version',
1247 'installer/installer.gyp:installer_util_strings', 1249 'installer/installer.gyp:installer_util_strings',
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 ] 2098 ]
2097 }], # 'coverage!=0' 2099 }], # 'coverage!=0'
2098 ], # 'conditions' 2100 ], # 'conditions'
2099 } 2101 }
2100 2102
2101 # Local Variables: 2103 # Local Variables:
2102 # tab-width:2 2104 # tab-width:2
2103 # indent-tabs-mode:nil 2105 # indent-tabs-mode:nil
2104 # End: 2106 # End:
2105 # vim: set expandtab tabstop=2 shiftwidth=2: 2107 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/renderer/devtools_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698