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

Side by Side Diff: chrome/chrome.gyp

Issue 203076: Fix the Linux shared build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 | « no previous file | courgette/courgette.gyp » ('j') | third_party/ffmpeg/ffmpeg.gyp » ('J')
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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 # Define the common dependencies that contain all the actual 9 # Define the common dependencies that contain all the actual
10 # Chromium functionality. This list gets pulled in below by 10 # Chromium functionality. This list gets pulled in below by
(...skipping 2256 matching lines...) Expand 10 before | Expand all | Expand 10 after
2267 }], 2267 }],
2268 ], 2268 ],
2269 }], 2269 }],
2270 ['OS=="linux" and toolkit_views==0', { 2270 ['OS=="linux" and toolkit_views==0', {
2271 'sources!': [ 2271 'sources!': [
2272 'browser/bookmarks/bookmark_drop_info.cc', 2272 'browser/bookmarks/bookmark_drop_info.cc',
2273 'browser/views/autocomplete/autocomplete_popup_gtk.cc', 2273 'browser/views/autocomplete/autocomplete_popup_gtk.cc',
2274 'browser/views/autocomplete/autocomplete_popup_gtk.h' 2274 'browser/views/autocomplete/autocomplete_popup_gtk.h'
2275 ], 2275 ],
2276 }], 2276 }],
2277 » ['OS=="freebsd"', { 2277 ['OS=="freebsd"', {
2278 » 'dependencies': [ 2278 'dependencies': [
2279 '../build/linux/system.gyp:gtk', 2279 '../build/linux/system.gyp:gtk',
2280 '../build/linux/system.gyp:nss', 2280 '../build/linux/system.gyp:nss',
2281 » ], 2281 ],
2282 » }], 2282 }],
2283 ['OS=="mac"', { 2283 ['OS=="mac"', {
2284 'sources!': [ 2284 'sources!': [
2285 'browser/automation/automation_provider_list_generic.cc', 2285 'browser/automation/automation_provider_list_generic.cc',
2286 'browser/bookmarks/bookmark_context_menu.cc', 2286 'browser/bookmarks/bookmark_context_menu.cc',
2287 'browser/bookmarks/bookmark_drop_info.cc', 2287 'browser/bookmarks/bookmark_drop_info.cc',
2288 'browser/dock_info.cc', 2288 'browser/dock_info.cc',
2289 'browser/download/download_request_dialog_delegate_win.cc', 2289 'browser/download/download_request_dialog_delegate_win.cc',
2290 'browser/jankometer.cc', 2290 'browser/jankometer.cc',
2291 'browser/password_manager/password_store_gnome.h', 2291 'browser/password_manager/password_store_gnome.h',
2292 'browser/password_manager/password_store_gnome.cc', 2292 'browser/password_manager/password_store_gnome.cc',
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
2934 'link_settings': { 2934 'link_settings': {
2935 'mac_bundle_resources': [ 2935 'mac_bundle_resources': [
2936 'renderer/renderer.sb', 2936 'renderer/renderer.sb',
2937 ], 2937 ],
2938 }, 2938 },
2939 'conditions': [ 2939 'conditions': [
2940 # Linux-specific rules. 2940 # Linux-specific rules.
2941 ['OS=="linux"', { 2941 ['OS=="linux"', {
2942 'dependencies': [ 2942 'dependencies': [
2943 '../build/linux/system.gyp:gtk', 2943 '../build/linux/system.gyp:gtk',
2944 '../sandbox/sandbox.gyp:sandbox',
2944 ], 2945 ],
2945 }], 2946 }],
2946 # Windows-specific rules. 2947 # Windows-specific rules.
2947 ['OS=="win"', { 2948 ['OS=="win"', {
2948 'include_dirs': [ 2949 'include_dirs': [
2949 'third_party/wtl/include', 2950 'third_party/wtl/include',
2950 ], 2951 ],
2951 },], 2952 },],
2952 ], 2953 ],
2953 }, 2954 },
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
4004 'browser/browser_theme_provider_unittest.cc', 4005 'browser/browser_theme_provider_unittest.cc',
4005 'browser/browser_unittest.cc', 4006 'browser/browser_unittest.cc',
4006 'browser/debugger/devtools_remote_message_unittest.cc', 4007 'browser/debugger/devtools_remote_message_unittest.cc',
4007 'browser/debugger/devtools_remote_listen_socket_unittest.cc', 4008 'browser/debugger/devtools_remote_listen_socket_unittest.cc',
4008 'browser/debugger/devtools_remote_listen_socket_unittest.h', 4009 'browser/debugger/devtools_remote_listen_socket_unittest.h',
4009 'browser/child_process_security_policy_unittest.cc', 4010 'browser/child_process_security_policy_unittest.cc',
4010 'browser/chrome_thread_unittest.cc', 4011 'browser/chrome_thread_unittest.cc',
4011 'browser/chromeos/chromeos_version_loader_unittest.cc', 4012 'browser/chromeos/chromeos_version_loader_unittest.cc',
4012 'browser/chromeos/pipe_reader_unittest.cc', 4013 'browser/chromeos/pipe_reader_unittest.cc',
4013 'browser/chromeos/external_cookie_handler_unittest.cc', 4014 'browser/chromeos/external_cookie_handler_unittest.cc',
4014 » 'browser/chromeos/gview_request_interceptor_unittest.cc', 4015 'browser/chromeos/gview_request_interceptor_unittest.cc',
4015 # It is safe to list */cocoa/* files in the "common" file list 4016 # It is safe to list */cocoa/* files in the "common" file list
4016 # without an explicit exclusion since gyp is smart enough to 4017 # without an explicit exclusion since gyp is smart enough to
4017 # exclude them from non-Mac builds. 4018 # exclude them from non-Mac builds.
4018 'browser/cocoa/about_window_controller_unittest.mm', 4019 'browser/cocoa/about_window_controller_unittest.mm',
4019 'browser/cocoa/autocomplete_text_field_cell_unittest.mm', 4020 'browser/cocoa/autocomplete_text_field_cell_unittest.mm',
4020 'browser/cocoa/autocomplete_text_field_editor_unittest.mm', 4021 'browser/cocoa/autocomplete_text_field_editor_unittest.mm',
4021 'browser/cocoa/autocomplete_text_field_unittest.mm', 4022 'browser/cocoa/autocomplete_text_field_unittest.mm',
4022 'browser/cocoa/base_view_unittest.mm', 4023 'browser/cocoa/base_view_unittest.mm',
4023 'browser/cocoa/background_gradient_view_unittest.mm', 4024 'browser/cocoa/background_gradient_view_unittest.mm',
4024 'browser/cocoa/background_tile_view_unittest.mm', 4025 'browser/cocoa/background_tile_view_unittest.mm',
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
4271 'sources': [ 4272 'sources': [
4272 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', 4273 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
4273 ], 4274 ],
4274 'sources!': [ 4275 'sources!': [
4275 # This test is mostly about renaming downloads to safe file 4276 # This test is mostly about renaming downloads to safe file
4276 # names. As such we don't need/want to port it to linux. We 4277 # names. As such we don't need/want to port it to linux. We
4277 # might want to write our own tests for the download manager 4278 # might want to write our own tests for the download manager
4278 # on linux, though. 4279 # on linux, though.
4279 'browser/download/download_manager_unittest.cc', 4280 'browser/download/download_manager_unittest.cc',
4280 'browser/views/bookmark_context_menu_test.cc', 4281 'browser/views/bookmark_context_menu_test.cc',
4281 » 'browser/gtk/options/cookies_view_unittest.cc', 4282 'browser/gtk/options/cookies_view_unittest.cc',
4282 # Compact Language Detection (cld) is not supported in linux yet. 4283 # Compact Language Detection (cld) is not supported in linux yet.
4283 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/ compact_lang_det_unittest_small.cc', 4284 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/ compact_lang_det_unittest_small.cc',
4284 ], 4285 ],
4285 }], 4286 }],
4286 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { 4287 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
4287 'dependencies': [ 4288 'dependencies': [
4288 '../views/views.gyp:views', 4289 '../views/views.gyp:views',
4289 ], 4290 ],
4290 'sources': [ 4291 'sources': [
4291 '<@(views_unit_tests_sources)', 4292 '<@(views_unit_tests_sources)',
4292 ], 4293 ],
4293 # We must use 'sources/' instead of 'source!' as there is a 4294 # We must use 'sources/' instead of 'source!' as there is a
4294 # target-default 'sources/' including gtk_unittest and 'source/' takes 4295 # target-default 'sources/' including gtk_unittest and 'source/' takes
4295 # precedence over 'sources!'. 4296 # precedence over 'sources!'.
4296 'sources/': [ 4297 'sources/': [
4297 ['exclude', 'browser/gtk/bookmark_editor_gtk_unittest\\.cc$'], 4298 ['exclude', 'browser/gtk/bookmark_editor_gtk_unittest\\.cc$'],
4298 ['exclude', 'browser/gtk/go_button_gtk_unittest\\.cc$'], 4299 ['exclude', 'browser/gtk/go_button_gtk_unittest\\.cc$'],
4299 ['exclude', 'browser/gtk/tabs/tab_renderer_gtk_unittest\\.cc$'], 4300 ['exclude', 'browser/gtk/tabs/tab_renderer_gtk_unittest\\.cc$'],
4300 » ['exclude', 'browser/gtk/options/cookies_view_unittest\\.cc$'], 4301 ['exclude', 'browser/gtk/options/cookies_view_unittest\\.cc$'],
4301 » ['exclude', 'browser/gtk/options/languages_page_gtk_unittest\\.cc$' ], 4302 ['exclude', 'browser/gtk/options/languages_page_gtk_unittest\\.cc$' ],
4302 » ['exclude', 'browser/gtk/gtk_theme_provider_unittest\\.cc$'], 4303 ['exclude', 'browser/gtk/gtk_theme_provider_unittest\\.cc$'],
4303 ], 4304 ],
4304 }], 4305 }],
4305 ['OS=="mac"', { 4306 ['OS=="mac"', {
4306 # The test fetches resources which means Mac need the app bundle to 4307 # The test fetches resources which means Mac need the app bundle to
4307 # exist on disk so it can pull from it. 4308 # exist on disk so it can pull from it.
4308 'dependencies': [ 4309 'dependencies': [
4309 'chrome', 4310 'chrome',
4310 ], 4311 ],
4311 'include_dirs': [ 4312 'include_dirs': [
4312 '../third_party/GTM', 4313 '../third_party/GTM',
(...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after
5400 'dependencies': [ 5401 'dependencies': [
5401 '../views/views.gyp:views', 5402 '../views/views.gyp:views',
5402 ], 5403 ],
5403 }], 5404 }],
5404 ['OS=="mac"', { 5405 ['OS=="mac"', {
5405 'sources': [ 5406 'sources': [
5406 'app/breakpad_mac_stubs.mm', 5407 'app/breakpad_mac_stubs.mm',
5407 'app/keystone_glue.h', 5408 'app/keystone_glue.h',
5408 'app/keystone_glue.m', 5409 'app/keystone_glue.m',
5409 ], 5410 ],
5410 » 'sources!': [ 5411 'sources!': [
5411 » '<@(browser_tests_sources_exclude_on_mac)', 5412 '<@(browser_tests_sources_exclude_on_mac)',
5412 » ], 5413 ],
5413 # TODO(mark): We really want this for all non-static library targe ts, 5414 # TODO(mark): We really want this for all non-static library targe ts,
5414 # but when we tried to pull it up to the common.gypi level, it bro ke 5415 # but when we tried to pull it up to the common.gypi level, it bro ke
5415 # other things like the ui, startup, and page_cycler tests. *shrug * 5416 # other things like the ui, startup, and page_cycler tests. *shrug *
5416 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 5417 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
5417 }], 5418 }],
5418 ], 5419 ],
5419 }, 5420 },
5420 ], 5421 ],
5421 }], 5422 }],
5422 ['OS=="win"', 5423 ['OS=="win"',
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
5644 'LinkIncremental': '<(msvs_large_module_debug_link_mode) ', 5645 'LinkIncremental': '<(msvs_large_module_debug_link_mode) ',
5645 }, 5646 },
5646 }, 5647 },
5647 }, 5648 },
5648 }, 5649 },
5649 }], 5650 }],
5650 ], 5651 ],
5651 }, 5652 },
5652 { 5653 {
5653 'target_name': 'interactive_ui_tests_dll', 5654 'target_name': 'interactive_ui_tests_dll',
5654 » # 'product_name': 'interactive_ui_tests', 5655 # 'product_name': 'interactive_ui_tests',
5655 'type': 'shared_library', 5656 'type': 'shared_library',
5656 'msvs_guid': '04116FAF-DA17-46EE-B108-971FCF0F0AFC', 5657 'msvs_guid': '04116FAF-DA17-46EE-B108-971FCF0F0AFC',
5657 'dependencies': [ 5658 'dependencies': [
5658 'chrome', 5659 'chrome',
5659 'chrome_resources', 5660 'chrome_resources',
5660 'chrome_strings', 5661 'chrome_strings',
5661 'debugger', 5662 'debugger',
5662 'test_support_common', 5663 'test_support_common',
5663 'test_support_ui', 5664 'test_support_ui',
5664 'syncapi', 5665 'syncapi',
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
6131 # Use outputs of this action as inputs for the main target build. 6132 # Use outputs of this action as inputs for the main target build.
6132 # Seems as a misnomer but makes this happy on Linux (scons). 6133 # Seems as a misnomer but makes this happy on Linux (scons).
6133 'process_outputs_as_sources': 1, 6134 'process_outputs_as_sources': 1,
6134 }, 6135 },
6135 ], # 'actions' 6136 ], # 'actions'
6136 }, 6137 },
6137 ] 6138 ]
6138 }], 6139 }],
6139 ], # 'conditions' 6140 ], # 'conditions'
6140 } 6141 }
OLDNEW
« no previous file with comments | « no previous file | courgette/courgette.gyp » ('j') | third_party/ffmpeg/ffmpeg.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698