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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 5360002: Use BRANDING for IE CEEE. Simplify chrome_dll_version handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with head Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« chrome/chrome_dll.gypi ('K') | « chrome/chrome_dll.gypi ('k') | chrome/version.h.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 4a2108fa804bfc2290ad95838f5aab0e27cab67c..de8eaeb3ca50ab1dcbf027fb8f78590270c86674 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -28,6 +28,7 @@
'renderer',
'chrome_resources',
'chrome_strings',
+ 'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp',
robertshield 2010/11/26 11:45:05 This looks like a merge artifact, please confirm t
Jói 2010/11/26 11:59:07 It's intentional, see the last line of the check-i
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
'theme_resources',
'../base/base.gyp:test_support_base',
@@ -383,7 +384,7 @@
],
'dependencies': [
'../app/app.gyp:app_resources',
- 'chrome.gyp:chrome_dll_version',
+ 'chrome.gyp:chrome_version_header',
'chrome.gyp:crash_service', # run time dependency
'chrome.gyp:installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
@@ -400,6 +401,7 @@
'../webkit/glue/resources/zoom_out.cur',
'app/chrome_dll.rc',
+ 'app/chrome_dll_version.rc',
'test/data/resource.rc',
# TODO: It would be nice to have these pulled in
@@ -693,7 +695,7 @@
'test/webdriver/commands/session_with_id.h',
'test/webdriver/commands/session_with_id.cc',
'test/webdriver/commands/source_command.h',
- 'test/webdriver/commands/source_command.cc',
+ 'test/webdriver/commands/source_command.cc',
'test/webdriver/commands/speed_command.h',
'test/webdriver/commands/speed_command.cc',
'test/webdriver/commands/title_command.h',
@@ -996,7 +998,6 @@
},
'sources': [
'app/breakpad_mac_stubs.mm',
- 'app/chrome_dll.rc',
# All unittests in browser, common, renderer and service.
'browser/about_flags_unittest.cc',
'browser/accessibility/browser_accessibility_mac_unittest.mm',
@@ -1799,7 +1800,7 @@
}],
['OS=="win"', {
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_header',
'installer_util_strings',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/isimpledom/isimpledom.gyp:isimpledom',
@@ -1816,6 +1817,9 @@
'<(DEPTH)/third_party/wtl/include',
],
'sources': [
+ 'app/chrome_dll.rc',
+ 'app/chrome_dll_version.rc',
+
# TODO: It would be nice to have these pulled in
# automatically from direct_dependent_settings in
# their various targets (net.gyp:net_resources, etc.),
@@ -1852,7 +1856,6 @@
},
}, { # else: OS != "win"
'sources!': [
- 'app/chrome_dll.rc',
'browser/accessibility/browser_accessibility_win_unittest.cc',
'browser/bookmarks/bookmark_codec_unittest.cc',
'browser/bookmarks/bookmark_drag_data_unittest.cc',
@@ -1917,10 +1920,6 @@
'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
'sources': [
'app/breakpad_mac_stubs.mm',
- 'app/chrome_command_ids.h',
- 'app/chrome_dll.rc',
- 'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
'browser/autocomplete/autocomplete_browsertest.cc',
'browser/browser_browsertest.cc',
'browser/browsing_data_database_helper_browsertest.cc',
@@ -2133,9 +2132,12 @@
}],
['OS=="win"', {
'sources': [
+ 'app/chrome_command_ids.h',
+ 'app/chrome_dll_resource.h',
+ 'app/chrome_dll.rc',
+ 'app/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
@@ -2147,7 +2149,7 @@
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_header',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -2169,10 +2171,6 @@
}
}, { # else: OS != "win"
'sources!': [
- 'app/chrome_command_ids.h',
- 'app/chrome_dll.rc',
- 'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
'browser/extensions/extension_popup_apitest.cc',
'browser/extensions/extension_rlz_apitest.cc',
# TODO(jam): http://crbug.com/15101 These tests fail on Linux and
@@ -2267,7 +2265,6 @@
],
'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
'sources': [
- 'app/chrome_dll.rc',
'browser/safe_browsing/safe_browsing_test.cc',
'test/in_process_browser_test.cc',
'test/in_process_browser_test.h',
@@ -2276,14 +2273,15 @@
'conditions': [
['OS=="win"', {
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_header',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
'sources': [
+ 'app/chrome_dll.rc',
+ 'app/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
@@ -2730,10 +2728,6 @@
# TODO(phajdan.jr): Only temporary, to make transition easier.
'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
'sources': [
- 'app/chrome_command_ids.h',
- 'app/chrome_dll.rc',
- 'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
'browser/autofill/autofill_common_test.cc',
'browser/autofill/autofill_common_test.h',
'browser/password_manager/password_form_data.cc',
@@ -2785,7 +2779,6 @@
'test/ui_test_utils_linux.cc',
'test/ui_test_utils_mac.mm',
'test/ui_test_utils_win.cc',
- 'test/data/resource.rc',
],
'conditions': [
# Plugin code.
@@ -2815,9 +2808,13 @@
}],
['OS=="win"', {
'sources': [
+ 'app/chrome_command_ids.h',
+ 'app/chrome_dll.rc',
+ 'app/chrome_dll_resource.h',
+ 'app/chrome_dll_version.rc',
+ 'test/data/resource.rc',
'<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
],
@@ -2825,7 +2822,7 @@
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_header',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -2845,12 +2842,6 @@
},
},
},
- }, { # else: OS != "win"
- 'sources!': [
- 'app/chrome_dll.rc',
- 'app/chrome_dll_version.rc.version',
- 'test/data/resource.rc',
- ],
}],
['toolkit_views==1', {
'dependencies': [
« chrome/chrome_dll.gypi ('K') | « chrome/chrome_dll.gypi ('k') | chrome/version.h.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698