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

Side by Side Diff: chrome/chrome.gyp

Issue 173309: Revert "linux: call g_thread_init() at relevant startup points" (Closed)
Patch Set: Created 11 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
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | chrome/plugin/plugin_thread.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) 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 3028 matching lines...) Expand 10 before | Expand all | Expand 10 after
3039 }, 3039 },
3040 ], 3040 ],
3041 }], 3041 }],
3042 ], 3042 ],
3043 'dependencies': [ 3043 'dependencies': [
3044 # On Linux, link the dependencies (libraries) that make up actual 3044 # On Linux, link the dependencies (libraries) that make up actual
3045 # Chromium functionality directly into the executable. 3045 # Chromium functionality directly into the executable.
3046 '<@(chromium_dependencies)', 3046 '<@(chromium_dependencies)',
3047 # Needed for chrome_dll_main.cc #include of gtk/gtk.h 3047 # Needed for chrome_dll_main.cc #include of gtk/gtk.h
3048 '../build/linux/system.gyp:gtk', 3048 '../build/linux/system.gyp:gtk',
3049 # Needed for chrome_dll_main.cc use of g_thread_init
3050 '../build/linux/system.gyp:gthread',
3049 ], 3051 ],
3050 'sources': [ 3052 'sources': [
3051 'app/chrome_dll_main.cc', 3053 'app/chrome_dll_main.cc',
3052 'app/chrome_dll_resource.h', 3054 'app/chrome_dll_resource.h',
3053 ], 3055 ],
3054 'copies': [ 3056 'copies': [
3055 { 3057 {
3056 'destination': '<(PRODUCT_DIR)', 3058 'destination': '<(PRODUCT_DIR)',
3057 'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak', 3059 'files': ['<(INTERMEDIATE_DIR)/repack/chrome.pak',
3058 'tools/build/linux/chrome-wrapper', 3060 'tools/build/linux/chrome-wrapper',
(...skipping 2771 matching lines...) Expand 10 before | Expand all | Expand 10 after
5830 # Use outputs of this action as inputs for the main target build. 5832 # Use outputs of this action as inputs for the main target build.
5831 # Seems as a misnomer but makes this happy on Linux (scons). 5833 # Seems as a misnomer but makes this happy on Linux (scons).
5832 'process_outputs_as_sources': 1, 5834 'process_outputs_as_sources': 1,
5833 }, 5835 },
5834 ], # 'actions' 5836 ], # 'actions'
5835 }, 5837 },
5836 ] 5838 ]
5837 }], 5839 }],
5838 ], # 'conditions' 5840 ], # 'conditions'
5839 } 5841 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | chrome/plugin/plugin_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698